2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/BlockCactus.java
|
|
|
|
|
+++ b/net/minecraft/server/BlockCactus.java
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -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);
|
2014-12-11 01:13:27 +01:00
|
|
|
|
2018-07-15 02:00:00 +02:00
|
|
|
if (j == 15) {
|
2019-12-10 23:00:00 +01:00
|
|
|
- worldserver.setTypeUpdate(blockposition1, this.getBlockData());
|
|
|
|
|
+ CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition1, this.getBlockData()); // CraftBukkit
|
2018-12-06 00:00:00 +01:00
|
|
|
IBlockData iblockdata1 = (IBlockData) iblockdata.set(BlockCactus.AGE, 0);
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2019-12-10 23:00:00 +01:00
|
|
|
worldserver.setTypeAndData(blockposition, iblockdata1, 4);
|
|
|
|
|
@@ -90,7 +92,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
|
