summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2013-04-30 01:21:04 -0500
committerTravis Watkins <amaranth@ubuntu.com>2013-04-30 01:21:04 -0500
commitf08081c77d5d8aaf03ae5997b5b8330824302766 (patch)
tree8ad49c9110343c7e0bb6fe2350dabaa73028817d /src
parent2715e4330585101f6c86da5ba8b2d35477b4b37b (diff)
downloadcraftbukkit-f08081c77d5d8aaf03ae5997b5b8330824302766.tar
craftbukkit-f08081c77d5d8aaf03ae5997b5b8330824302766.tar.gz
craftbukkit-f08081c77d5d8aaf03ae5997b5b8330824302766.tar.lz
craftbukkit-f08081c77d5d8aaf03ae5997b5b8330824302766.tar.xz
craftbukkit-f08081c77d5d8aaf03ae5997b5b8330824302766.zip
Always process movement for vehicles and passengers. Fixes BUKKIT-4142
As an optimization we don't do any movement processing on entities that have not moved. However, players in minecarts trigger this condition when the minecart is moving on its own. This causes issues with things that rely on player collision like tripwires. To correct this and any future related issues we always handle movement for passengers and their vehicles even if one of the two hasn't moved since they are linked.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/Entity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 943a6ab3..0f7be97a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -418,7 +418,7 @@ public abstract class Entity {
public void move(double d0, double d1, double d2) {
// CraftBukkit start - Don't do anything if we aren't moving
- if (d0 == 0 && d1 == 0 && d2 == 0) {
+ if (d0 == 0 && d1 == 0 && d2 == 0 && this.vehicle == null && this.passenger == null) {
return;
}
// CraftBukkit end