summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockCactus.patch
blob: 2103c4245b4e938056fc0914996160ea7ecdbb0c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
--- a/net/minecraft/server/BlockCactus.java
+++ b/net/minecraft/server/BlockCactus.java
@@ -3,6 +3,8 @@
 import java.util.Iterator;
 import java.util.Random;
 
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
 public class BlockCactus extends Block {
 
     public static final BlockStateInteger AGE = BlockProperties.X;
@@ -31,7 +33,7 @@
                     int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue();
 
                     if (j == 15) {
-                        world.setTypeUpdate(blockposition1, this.getBlockData());
+                        CraftEventFactory.handleBlockGrowEvent(world, blockposition1, this.getBlockData()); // CraftBukkit
                         IBlockData iblockdata1 = (IBlockData) iblockdata.set(BlockCactus.AGE, Integer.valueOf(0));
 
                         world.setTypeAndData(blockposition, iblockdata1, 4);
@@ -92,7 +94,9 @@
     }
 
     public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) {
+        CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit
         entity.damageEntity(DamageSource.CACTUS, 1.0F);
+        CraftEventFactory.blockDamage = null; // CraftBukkit
     }
 
     public TextureType c() {