summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockMinecartDetector.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/BlockMinecartDetector.patch')
-rw-r--r--nms-patches/BlockMinecartDetector.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/nms-patches/BlockMinecartDetector.patch b/nms-patches/BlockMinecartDetector.patch
index 2ac814ed..71085fbd 100644
--- a/nms-patches/BlockMinecartDetector.patch
+++ b/nms-patches/BlockMinecartDetector.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/BlockMinecartDetector.java 2014-11-28 17:43:42.917707439 +0000
-+++ src/main/java/net/minecraft/server/BlockMinecartDetector.java 2014-11-28 17:38:22.000000000 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/BlockMinecartDetector.java 2015-02-26 22:40:22.171608144 +0000
++++ src/main/java/net/minecraft/server/BlockMinecartDetector.java 2015-02-26 22:40:22.175608144 +0000
@@ -4,6 +4,8 @@
import java.util.List;
import java.util.Random;
@@ -8,12 +8,11 @@
+
public class BlockMinecartDetector extends BlockMinecartTrackAbstract {
- public static final BlockStateEnum SHAPE = BlockStateEnum.a("shape", EnumTrackPosition.class, (Predicate) (new BlockMinecartDetectorInnerClass1()));
-@@ -55,6 +57,17 @@
- if (!list.isEmpty()) {
+ public static final BlockStateEnum<BlockMinecartTrackAbstract.EnumTrackPosition> SHAPE = BlockStateEnum.a("shape", BlockMinecartTrackAbstract.EnumTrackPosition.class, new Predicate() {
+@@ -64,6 +66,17 @@
flag1 = true;
}
-+
+
+ // CraftBukkit start
+ if (flag != flag1) {
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
@@ -24,6 +23,7 @@
+ flag1 = eventRedstone.getNewCurrent() > 0;
+ }
+ // CraftBukkit end
-
++
if (flag1 && !flag) {
world.setTypeAndData(blockposition, iblockdata.set(BlockMinecartDetector.POWERED, Boolean.valueOf(true)), 3);
+ world.applyPhysics(blockposition, this);