diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockCactus.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockCactus.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java index 5d1da1bd..1997a863 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -1,12 +1,9 @@ package net.minecraft.server; -// CraftBukkit start -import org.bukkit.event.entity.EntityDamageByBlockEvent; -import org.bukkit.event.entity.EntityDamageEvent; -// CraftBukkit end - import java.util.Random; +import org.bukkit.event.entity.EntityDamageByBlockEvent; // CraftBukkit + public class BlockCactus extends Block { protected BlockCactus(int i, int j) { @@ -90,7 +87,7 @@ public class BlockCactus extends Block { 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, EntityDamageEvent.DamageCause.CONTACT, 1); + EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee, org.bukkit.event.entity.EntityDamageEvent.DamageCause.CONTACT, 1); world.getServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { |