diff options
| author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-21 16:54:30 +1100 |
|---|---|---|
| committer | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-21 16:54:30 +1100 |
| commit | 1cbde901bacb7620e555d1725c95619641caba8e (patch) | |
| tree | 60157572f1bff78ecd6ede7f9f443f138e01c9fe /src/main/java/net/minecraft/server/BlockCactus.java | |
| parent | 1dad7de4f34982efff946ec51ca576902d79bb8e (diff) | |
| download | craftbukkit-1cbde901bacb7620e555d1725c95619641caba8e.tar craftbukkit-1cbde901bacb7620e555d1725c95619641caba8e.tar.gz craftbukkit-1cbde901bacb7620e555d1725c95619641caba8e.tar.lz craftbukkit-1cbde901bacb7620e555d1725c95619641caba8e.tar.xz craftbukkit-1cbde901bacb7620e555d1725c95619641caba8e.zip | |
Entity audit. Adds checks for null entities, and adds conformity.
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockCactus.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockCactus.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java index 1d288217..64a3455a 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -1,11 +1,6 @@ package net.minecraft.server; // CraftBukkit start -import org.bukkit.entity.LivingEntity; -import org.bukkit.craftbukkit.block.CraftBlock; -import org.bukkit.craftbukkit.entity.CraftEntity; -import org.bukkit.craftbukkit.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageEvent; @@ -102,7 +97,7 @@ public class BlockCactus extends Block { if(entity instanceof EntityLiving) { CraftServer server = ((WorldServer) world).getServer(); org.bukkit.block.Block damager = ((WorldServer) world).getWorld().getBlockAt(i, j, k); - org.bukkit.entity.Entity damagee = entity.getBukkitEntity(); + org.bukkit.entity.Entity damagee = (entity == null)?null:entity.getBukkitEntity(); DamageCause damageType = EntityDamageEvent.DamageCause.CONTACT; int damageDone = 1; |