summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockRedstoneLamp.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/BlockRedstoneLamp.patch')
-rw-r--r--nms-patches/BlockRedstoneLamp.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/nms-patches/BlockRedstoneLamp.patch b/nms-patches/BlockRedstoneLamp.patch
index 9a152395..a784853a 100644
--- a/nms-patches/BlockRedstoneLamp.patch
+++ b/nms-patches/BlockRedstoneLamp.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/BlockRedstoneLamp.java 2014-11-28 17:43:42.945707438 +0000
-+++ src/main/java/net/minecraft/server/BlockRedstoneLamp.java 2014-11-28 17:38:20.000000000 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/BlockRedstoneLamp.java 2015-02-26 22:40:22.227608143 +0000
++++ src/main/java/net/minecraft/server/BlockRedstoneLamp.java 2015-02-26 22:40:22.227608143 +0000
@@ -2,6 +2,8 @@
import java.util.Random;
@@ -35,13 +35,13 @@
@@ -40,6 +52,11 @@
public void b(World world, BlockPosition blockposition, IBlockData iblockdata, Random random) {
- if (!world.isStatic) {
+ if (!world.isClientSide) {
if (this.a && !world.isBlockIndirectlyPowered(blockposition)) {
-+ // CraftBukkit start
-+ if (CraftEventFactory.callRedstoneChange(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), 15, 0).getNewCurrent() != 0) {
-+ return;
-+ }
-+ // CraftBukkit end
++ // CraftBukkit start
++ if (CraftEventFactory.callRedstoneChange(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), 15, 0).getNewCurrent() != 0) {
++ return;
++ }
++ // CraftBukkit end
world.setTypeAndData(blockposition, Blocks.REDSTONE_LAMP.getBlockData(), 2);
}