summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-11-13 23:23:21 -0600
committerTravis Watkins <amaranth@ubuntu.com>2012-11-13 23:34:43 -0600
commit2b22ae2d457a152db547df93ba8f915c24093b7b (patch)
tree5c71834c87b894f274b5d41b340a8395392c779f /src/main/java/net/minecraft
parentdb43197ecf75ffe7ddcb0b4bf95fca08e028c2b4 (diff)
downloadcraftbukkit-2b22ae2d457a152db547df93ba8f915c24093b7b.tar
craftbukkit-2b22ae2d457a152db547df93ba8f915c24093b7b.tar.gz
craftbukkit-2b22ae2d457a152db547df93ba8f915c24093b7b.tar.lz
craftbukkit-2b22ae2d457a152db547df93ba8f915c24093b7b.tar.xz
craftbukkit-2b22ae2d457a152db547df93ba8f915c24093b7b.zip
Potentially fix glitch with falling entities.
When a block creates a falling entity the block is not immediately removed from the world. Instead, the falling entity is responsible for removing it but only if the block still exists. Due to certain piston mechanics it is possible to move the block before this check happens and thus the block is not removed. This should be fine as the entity will kill itself in this situation. However, the code does not stop here and continues running the rest of the entity logic which includes either placing a block in the world or placing a block item in the world depending on the circumstances.
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r--src/main/java/net/minecraft/server/EntityFallingBlock.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index 7fe8ab57..dd8b64f4 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -83,6 +83,7 @@ public class EntityFallingBlock extends Entity {
this.world.setTypeId(i, j, k, 0);
} else {
this.die();
+ return; // CraftBukkit
}
}