summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/net/minecraft/server/BlockPiston.java2
-rw-r--r--src/main/java/net/minecraft/server/Chunk.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
index 3e5465b6..0f1b5e58 100644
--- a/src/main/java/net/minecraft/server/BlockPiston.java
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -217,7 +217,7 @@ public class BlockPiston extends Block {
}
public static int e(int i) {
- if ((i & 7) >= Facing.OPPOSITE_FACING.length) return 0; // CraftBukkit - check for AIOOB on piston data
+ if ((i & 7) >= Facing.OPPOSITE_FACING.length) return 7; // CraftBukkit - check for AIOOB on piston data
return i & 7;
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 06e3d962..941a4c22 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -429,8 +429,8 @@ public class Chunk {
if (l != 0) {
if (!this.world.isStatic) {
- // CraftBukkit start - Don't extend piston until data is set, don't "place" if we're processing the event
- if (!this.world.suppressPhysics && (!(Block.byId[l] instanceof BlockPiston) || i2 != 0)) {
+ // CraftBukkit start - Don't "place" if we're processing the event
+ if (!this.world.suppressPhysics) {
Block.byId[l].onPlace(this.world, j2, j, k2);
}
// CraftBukkit end