diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-11 00:44:30 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-11 00:44:30 +0000 |
| commit | fe41b017ca7b4ec872a4e5a7681750fad545868f (patch) | |
| tree | e75c407b66f3233cf69d183920eab6480890b68f /nms-patches | |
| parent | 14d69f15139058170cba855c99af059bc62b3b85 (diff) | |
| download | craftbukkit-fe41b017ca7b4ec872a4e5a7681750fad545868f.tar craftbukkit-fe41b017ca7b4ec872a4e5a7681750fad545868f.tar.gz craftbukkit-fe41b017ca7b4ec872a4e5a7681750fad545868f.tar.lz craftbukkit-fe41b017ca7b4ec872a4e5a7681750fad545868f.tar.xz craftbukkit-fe41b017ca7b4ec872a4e5a7681750fad545868f.zip | |
Fixed mis-placed CraftBukkit comments
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/BlockCactus.patch | 12 | ||||
| -rw-r--r-- | nms-patches/BlockReed.patch | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/nms-patches/BlockCactus.patch b/nms-patches/BlockCactus.patch index 212835fc..6f8728ca 100644 --- a/nms-patches/BlockCactus.patch +++ b/nms-patches/BlockCactus.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/BlockCactus.java 2014-12-11 00:12:27.888272532 +0000 -+++ src/main/java/net/minecraft/server/BlockCactus.java 2014-12-11 00:10:42.528273676 +0000 +--- ../work/decompile-8eb82bde/net/minecraft/server/BlockCactus.java 2014-12-11 00:44:17.652251803 +0000 ++++ src/main/java/net/minecraft/server/BlockCactus.java 2014-12-11 00:43:46.164252144 +0000 @@ -3,6 +3,8 @@ import java.util.Iterator; import java.util.Random; @@ -9,20 +9,18 @@ public class BlockCactus extends Block { public static final BlockStateInteger AGE = BlockStateInteger.of("age", 0, 15); -@@ -28,10 +30,11 @@ +@@ -28,9 +30,10 @@ int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue(); if (j == 15) { - world.setTypeUpdate(blockposition1, this.getBlockData()); -+ // world.setTypeUpdate(blockposition1, this.getBlockData()); ++ // world.setTypeUpdate(blockposition1, this.getBlockData()); // CraftBukkit IBlockData iblockdata1 = iblockdata.set(BlockCactus.AGE, Integer.valueOf(0)); -- world.setTypeAndData(blockposition, iblockdata1, 4); + CraftEventFactory.handleBlockGrowEvent(world, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ(), this, 0); // CraftBukkit -+ world.setTypeAndData(blockposition, iblockdata1, 4); // CraftBukkit + world.setTypeAndData(blockposition, iblockdata1, 4); this.doPhysics(world, blockposition1, iblockdata1, this); } else { - world.setTypeAndData(blockposition, iblockdata.set(BlockCactus.AGE, Integer.valueOf(j + 1)), 4); @@ -83,7 +86,9 @@ } diff --git a/nms-patches/BlockReed.patch b/nms-patches/BlockReed.patch index 1409d40a..5a84ef63 100644 --- a/nms-patches/BlockReed.patch +++ b/nms-patches/BlockReed.patch @@ -1,13 +1,13 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/BlockReed.java 2014-12-11 00:12:28.088272530 +0000 -+++ src/main/java/net/minecraft/server/BlockReed.java 2014-12-11 00:10:59.832273488 +0000 +--- ../work/decompile-8eb82bde/net/minecraft/server/BlockReed.java 2014-12-11 00:44:17.804251801 +0000 ++++ src/main/java/net/minecraft/server/BlockReed.java 2014-12-11 00:43:36.504252249 +0000 @@ -29,8 +29,13 @@ int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue(); if (j == 15) { - world.setTypeUpdate(blockposition.up(), this.getBlockData()); + // CraftBukkit start -+ // world.setTypeUpdate(blockposition.up(), this.getBlockData()); -+ BlockPosition upPos = blockposition.up(); ++ // world.setTypeUpdate(blockposition.up(), this.getBlockData()); // CraftBukkit ++ BlockPosition upPos = blockposition.up(); + org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, upPos.getX(), upPos.getY(), upPos.getZ(), this, 0); world.setTypeAndData(blockposition, iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4); + // CraftBukkit end |