Paper/nms-patches/BlockCactus.patch

31 lines
1.3 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- 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 {
2019-04-23 04:00:00 +02:00
public static final BlockStateInteger AGE = BlockProperties.ad;
@@ -32,7 +34,7 @@
2018-12-06 00:00:00 +01:00
int j = (Integer) iblockdata.get(BlockCactus.AGE);
2018-07-15 02:00:00 +02:00
if (j == 15) {
- world.setTypeUpdate(blockposition1, this.getBlockData());
+ CraftEventFactory.handleBlockGrowEvent(world, blockposition1, this.getBlockData()); // CraftBukkit
2018-12-06 00:00:00 +01:00
IBlockData iblockdata1 = (IBlockData) iblockdata.set(BlockCactus.AGE, 0);
2018-07-15 02:00:00 +02:00
world.setTypeAndData(blockposition, iblockdata1, 4);
2019-04-23 04:00:00 +02:00
@@ -95,7 +97,9 @@
2019-04-23 04:00:00 +02:00
@Override
2018-07-15 02:00:00 +02:00
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
}
2019-04-23 04:00:00 +02:00
@Override