OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 11:42:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-179: Fix the age counter not being reset for cacti and reeds

Browse source
This commit is contained in:
Thinkofdeath 2014-12-11 00:13:27 +00:00
parent f48410a39c
commit d5c9a3c990
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nms-patches/BlockCactus.patch
View file

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockCactus.java 2014-11-28 17:43:42.877707440 +0000 --- ../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-11-28 17:38:18.000000000 +0000 +++ src/main/java/net/minecraft/server/BlockCactus.java 2014-12-11 00:10:42.528273676 +0000
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
import java.util.Iterator; import java.util.Iterator;
import java.util.Random; import java.util.Random;
@ -9,13 +9,17 @@
public class BlockCactus extends Block { public class BlockCactus extends Block {
public static final BlockStateInteger AGE = BlockStateInteger.of("age", 0, 15); public static final BlockStateInteger AGE = BlockStateInteger.of("age", 0, 15);
@@ -31,7 +33,8 @@ @@ -28,10 +30,11 @@
world.setTypeUpdate(blockposition1, this.getBlockData()); int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue();
if (j == 15) {
- world.setTypeUpdate(blockposition1, this.getBlockData());
+ // world.setTypeUpdate(blockposition1, this.getBlockData());
IBlockData iblockdata1 = iblockdata.set(BlockCactus.AGE, Integer.valueOf(0)); IBlockData iblockdata1 = iblockdata.set(BlockCactus.AGE, Integer.valueOf(0));
- world.setTypeAndData(blockposition, iblockdata1, 4); - world.setTypeAndData(blockposition, iblockdata1, 4);
+ CraftEventFactory.handleBlockGrowEvent(world, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ(), this, 0); // CraftBukkit + CraftEventFactory.handleBlockGrowEvent(world, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ(), this, 0); // CraftBukkit
+ // world.setTypeAndData(blockposition, iblockdata1, 4); // CraftBukkit + world.setTypeAndData(blockposition, iblockdata1, 4); // CraftBukkit
this.doPhysics(world, blockposition1, iblockdata1, this); this.doPhysics(world, blockposition1, iblockdata1, this);
} else { } else {
world.setTypeAndData(blockposition, iblockdata.set(BlockCactus.AGE, Integer.valueOf(j + 1)), 4); world.setTypeAndData(blockposition, iblockdata.set(BlockCactus.AGE, Integer.valueOf(j + 1)), 4);

9
nms-patches/BlockReed.patch
View file

@ -1,16 +1,15 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockReed.java 2014-11-28 17:43:42.957707438 +0000 --- ../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-11-28 17:38:18.000000000 +0000 +++ src/main/java/net/minecraft/server/BlockReed.java 2014-12-11 00:10:59.832273488 +0000
@@ -29,8 +29,13 @@ @@ -29,8 +29,13 @@
int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue(); int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue();
if (j == 15) { if (j == 15) {
- world.setTypeUpdate(blockposition.up(), this.getBlockData()); - world.setTypeUpdate(blockposition.up(), this.getBlockData());
- world.setTypeAndData(blockposition, iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4);
+ // CraftBukkit start + // CraftBukkit start
+ // world.setTypeUpdate(blockposition.up(), this.getBlockData()); + // world.setTypeUpdate(blockposition.up(), this.getBlockData());
+ // world.setTypeAndData(blockposition, iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4);
+ BlockPosition upPos = blockposition.up(); + BlockPosition upPos = blockposition.up();
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, upPos.getX(), upPos.getY(), upPos.getZ(), this, 0); + 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 + // CraftBukkit end
+ +
} else { } else {