From a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Mon, 27 Jun 2011 00:25:01 +0200 Subject: Massive renaming update in nms. If you bypassed Bukkit, you will likely break. Also minimized all the nms diffs and generic cleanups all around. --- src/main/java/net/minecraft/server/BlockCactus.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/main/java/net/minecraft/server/BlockCactus.java') diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java index 44752347..90596299 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -1,10 +1,8 @@ package net.minecraft.server; // CraftBukkit start -import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageCause; // CraftBukkit end import java.util.Random; @@ -85,14 +83,11 @@ public class BlockCactus extends Block { public void a(World world, int i, int j, int k, Entity entity) { // CraftBukkit start - ENTITY_DAMAGEBY_BLOCK event if (entity instanceof EntityLiving) { - CraftServer server = ((WorldServer) world).getServer(); - org.bukkit.block.Block damager = ((WorldServer) world).getWorld().getBlockAt(i, j, k); + org.bukkit.block.Block damager = world.getWorld().getBlockAt(i, j, k); org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); - DamageCause damageType = EntityDamageEvent.DamageCause.CONTACT; - int damageDone = 1; - EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee, damageType, damageDone); - server.getPluginManager().callEvent(event); + EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee, EntityDamageEvent.DamageCause.CONTACT, 1); + world.getServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { entity.damageEntity((Entity) null, event.getDamage()); @@ -100,6 +95,7 @@ public class BlockCactus extends Block { return; } // CraftBukkit end + entity.damageEntity((Entity) null, 1); } } -- cgit v1.2.3