diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockCactus.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockCactus.java | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java index 57eb59d6..e920c6f4 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -2,7 +2,7 @@ package net.minecraft.server; import java.util.Random; -import org.bukkit.event.entity.EntityDamageByBlockEvent; // CraftBukkit +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class BlockCactus extends Block { @@ -24,7 +24,7 @@ public class BlockCactus extends Block { int i1 = world.getData(i, j, k); if (i1 == 15) { - org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j + 1, k, this, 0); // CraftBukkit + CraftEventFactory.handleBlockGrowEvent(world, i, j + 1, k, this, 0); // CraftBukkit world.setData(i, j, k, 0, 4); this.doPhysics(world, i, j + 1, k, this); } else { @@ -79,22 +79,8 @@ public class BlockCactus extends Block { } public void a(World world, int i, int j, int k, Entity entity) { - // CraftBukkit start - EntityDamageByBlock event - if (entity instanceof EntityLiving) { - org.bukkit.block.Block damager = world.getWorld().getBlockAt(i, j, k); - org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); - - EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee, org.bukkit.event.entity.EntityDamageEvent.DamageCause.CONTACT, 1D); - world.getServer().getPluginManager().callEvent(event); - - if (!event.isCancelled()) { - damagee.setLastDamageCause(event); - entity.damageEntity(DamageSource.CACTUS, (float) event.getDamage()); - } - return; - } - // CraftBukkit end - + CraftEventFactory.blockDamage = world.getWorld().getBlockAt(i, j, k); // CraftBukkit entity.damageEntity(DamageSource.CACTUS, 1.0F); + CraftEventFactory.blockDamage = null; // CraftBukkit } } |