diff options
author | feildmaster <admin@feildmaster.com> | 2013-04-09 22:25:06 -0500 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2013-04-10 21:33:33 -0500 |
commit | 77d1524b3d11f2580cf5792a79cd4c72385fdee9 (patch) | |
tree | 0a8a817a20cde1904bd1894705d28434ad524350 /src/main/java/net/minecraft/server/EntitySnowman.java | |
parent | 535a85a5b0a25fdbce3a5ae8440d2c60f0fae6ee (diff) | |
download | craftbukkit-77d1524b3d11f2580cf5792a79cd4c72385fdee9.tar craftbukkit-77d1524b3d11f2580cf5792a79cd4c72385fdee9.tar.gz craftbukkit-77d1524b3d11f2580cf5792a79cd4c72385fdee9.tar.lz craftbukkit-77d1524b3d11f2580cf5792a79cd4c72385fdee9.tar.xz craftbukkit-77d1524b3d11f2580cf5792a79cd4c72385fdee9.zip |
Refactor EntityDamageEvents. Adds BUKKIT-1944 & BUKKIT-3684
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySnowman.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntitySnowman.java | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java index fd88beab..8b9fb83c 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -1,8 +1,8 @@ package net.minecraft.server; // CraftBukkit start +import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.block.EntityBlockFormEvent; -import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit end public class EntitySnowman extends EntityGolem implements IRangedEntity { @@ -30,30 +30,14 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity { public void c() { super.c(); if (this.F()) { - // CraftBukkit start - EntityDamageEvent event = new EntityDamageEvent(this.getBukkitEntity(), EntityDamageEvent.DamageCause.DROWNING, 1); - this.world.getServer().getPluginManager().callEvent(event); - - if (!event.isCancelled()) { - event.getEntity().setLastDamageCause(event); - this.damageEntity(DamageSource.DROWN, event.getDamage()); - } - // CraftBukkit end + this.damageEntity(DamageSource.DROWN, 1); } int i = MathHelper.floor(this.locX); int j = MathHelper.floor(this.locZ); if (this.world.getBiome(i, j).j() > 1.0F) { - // CraftBukkit start - EntityDamageEvent event = new EntityDamageEvent(this.getBukkitEntity(), EntityDamageEvent.DamageCause.MELTING, 1); - this.world.getServer().getPluginManager().callEvent(event); - - if (!event.isCancelled()) { - event.getEntity().setLastDamageCause(event); - this.damageEntity(DamageSource.BURN, event.getDamage()); - } - // CraftBukkit end + this.damageEntity(CraftEventFactory.MELTING, 1); // CraftBukkit - DamageSource.BURN -> CraftEventFactory.MELTING } for (i = 0; i < 4; ++i) { @@ -90,7 +74,7 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity { loot.add(new org.bukkit.inventory.ItemStack(Item.SNOW_BALL.id, j)); } - org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, loot); + CraftEventFactory.callEntityDeathEvent(this, loot); // CraftBukkit end } |