summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityBoat.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-05-31 15:55:45 +0200
committerErik Broes <erikbroes@grum.nl>2011-05-31 15:56:05 +0200
commit62b5da4e3a6c9f930e08da292e603aa8b8df436e (patch)
tree981af01e9600593f9a1b5775bbbf3ebd472a0f36 /src/main/java/net/minecraft/server/EntityBoat.java
parent6dbd710bbf37728eb760cacb019d1e384a7e1311 (diff)
downloadcraftbukkit-62b5da4e3a6c9f930e08da292e603aa8b8df436e.tar
craftbukkit-62b5da4e3a6c9f930e08da292e603aa8b8df436e.tar.gz
craftbukkit-62b5da4e3a6c9f930e08da292e603aa8b8df436e.tar.lz
craftbukkit-62b5da4e3a6c9f930e08da292e603aa8b8df436e.tar.xz
craftbukkit-62b5da4e3a6c9f930e08da292e603aa8b8df436e.zip
Update for 1.6.6
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityBoat.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityBoat.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 69865424..178c9270 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -129,6 +129,10 @@ public class EntityBoat extends Entity {
}
// CraftBukkit end
+ if (this.passenger != null) {
+ this.passenger.mount(this);
+ }
+
int j;
for (j = 0; j < 3; ++j) {
@@ -230,7 +234,11 @@ public class EntityBoat extends Entity {
d3 = d0 * 2.0D - 1.0D;
this.motY += 0.03999999910593033D * d3;
} else {
- this.motY += 0.0010000000474974513D;
+ if (this.motY < 0.0D) {
+ this.motY /= 2.0D;
+ }
+
+ this.motY += 0.007000000216066837D;
}
if (this.passenger != null) {