summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockPiston.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
committermd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
commitc5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch)
tree9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/BlockPiston.patch
parent4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff)
downloadcraftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/BlockPiston.patch')
-rw-r--r--nms-patches/BlockPiston.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/nms-patches/BlockPiston.patch b/nms-patches/BlockPiston.patch
index 58de3a2e..9c7cf575 100644
--- a/nms-patches/BlockPiston.patch
+++ b/nms-patches/BlockPiston.patch
@@ -1,8 +1,8 @@
--- a/net/minecraft/server/BlockPiston.java
+++ b/net/minecraft/server/BlockPiston.java
-@@ -4,6 +4,18 @@
- import java.util.ArrayList;
+@@ -5,6 +5,18 @@
import java.util.List;
+ import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.AbstractList;
@@ -19,7 +19,7 @@
public class BlockPiston extends BlockDirectional {
public static final BlockStateBoolean EXTENDED = BlockStateBoolean.of("extended");
-@@ -98,6 +110,18 @@
+@@ -99,6 +111,18 @@
world.playBlockAction(blockposition, this, 0, enumdirection.a());
}
} else if (!flag && ((Boolean) iblockdata.get(BlockPiston.EXTENDED)).booleanValue()) {
@@ -38,7 +38,7 @@
world.playBlockAction(blockposition, this, 1, enumdirection.a());
}
-@@ -188,7 +212,7 @@
+@@ -189,7 +213,7 @@
}
}
@@ -47,7 +47,7 @@
this.a(world, blockposition, enumdirection, false);
}
} else {
-@@ -284,6 +308,48 @@
+@@ -286,6 +310,48 @@
int j = list.size() + list1.size();
IBlockData[] aiblockdata = new IBlockData[j];
EnumDirection enumdirection1 = flag ? enumdirection : enumdirection.opposite();