2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/level/block/BlockCactus.java
|
|
|
|
+++ b/net/minecraft/world/level/block/BlockCactus.java
|
|
|
|
@@ -23,6 +23,8 @@
|
|
|
|
import net.minecraft.world.phys.shapes.VoxelShape;
|
|
|
|
import net.minecraft.world.phys.shapes.VoxelShapeCollision;
|
2014-11-25 22:32:16 +01:00
|
|
|
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
|
|
+
|
|
|
|
public class BlockCactus extends Block {
|
|
|
|
|
2020-06-25 02:00:00 +02:00
|
|
|
public static final BlockStateInteger AGE = BlockProperties.aj;
|
2021-03-15 23:00:00 +01:00
|
|
|
@@ -57,7 +59,7 @@
|
2020-06-25 02:00:00 +02:00
|
|
|
int j = (Integer) iblockdata.get(BlockCactus.AGE);
|
2014-12-11 01:13:27 +01:00
|
|
|
|
2020-06-25 02:00:00 +02:00
|
|
|
if (j == 15) {
|
|
|
|
- worldserver.setTypeUpdate(blockposition1, this.getBlockData());
|
|
|
|
+ CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition1, this.getBlockData()); // CraftBukkit
|
|
|
|
IBlockData iblockdata1 = (IBlockData) iblockdata.set(BlockCactus.AGE, 0);
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2020-06-25 02:00:00 +02:00
|
|
|
worldserver.setTypeAndData(blockposition, iblockdata1, 4);
|
2021-03-15 23:00:00 +01:00
|
|
|
@@ -114,7 +116,9 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
|
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) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit
|
|
|
|
entity.damageEntity(DamageSource.CACTUS, 1.0F);
|
2016-06-12 02:13:51 +02:00
|
|
|
+ CraftEventFactory.blockDamage = null; // CraftBukkit
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|
2019-04-23 04:00:00 +02:00
|
|
|
@Override
|