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 {
|
|
|
|
|
|
|
|
|
|
public static final BlockStateInteger AGE = BlockStateInteger.of("age", 0, 15);
|
2016-02-29 22:32:46 +01:00
|
|
|
@@ -30,9 +32,10 @@
|
2014-12-11 01:13:27 +01:00
|
|
|
int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue();
|
|
|
|
|
|
|
|
|
|
if (j == 15) {
|
|
|
|
|
- world.setTypeUpdate(blockposition1, this.getBlockData());
|
2014-12-11 01:44:30 +01:00
|
|
|
+ // world.setTypeUpdate(blockposition1, this.getBlockData()); // CraftBukkit
|
2014-11-25 22:32:16 +01:00
|
|
|
IBlockData iblockdata1 = iblockdata.set(BlockCactus.AGE, Integer.valueOf(0));
|
|
|
|
|
|
|
|
|
|
+ CraftEventFactory.handleBlockGrowEvent(world, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ(), this, 0); // CraftBukkit
|
2014-12-11 01:44:30 +01:00
|
|
|
world.setTypeAndData(blockposition, iblockdata1, 4);
|
2016-05-10 13:47:39 +02:00
|
|
|
iblockdata1.doPhysics(world, blockposition1, this);
|
2014-11-25 22:32:16 +01:00
|
|
|
} else {
|
2016-06-12 02:13:51 +02:00
|
|
|
@@ -87,7 +90,9 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void a(World world, BlockPosition blockposition, IBlockData iblockdata, Entity entity) {
|
|
|
|
|
+ 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
|
|
|
}
|
|
|
|
|
|
2016-06-12 02:13:51 +02:00
|
|
|
public IBlockData fromLegacyData(int i) {
|
