diff options
| author | Erik Broes <erikbroes@grum.nl> | 2012-01-18 08:16:38 +0100 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2012-01-18 08:16:38 +0100 |
| commit | 737cf284e33af978431b0443aa2cd43b2e10f6bc (patch) | |
| tree | cf680ad383d1404974efb07953a9cb9d99ca1893 /src/main/java/net/minecraft/server/MobEffectList.java | |
| parent | 112e0816b9aa0b51db2a08010385d38d5a965cb3 (diff) | |
| download | craftbukkit-737cf284e33af978431b0443aa2cd43b2e10f6bc.tar craftbukkit-737cf284e33af978431b0443aa2cd43b2e10f6bc.tar.gz craftbukkit-737cf284e33af978431b0443aa2cd43b2e10f6bc.tar.lz craftbukkit-737cf284e33af978431b0443aa2cd43b2e10f6bc.tar.xz craftbukkit-737cf284e33af978431b0443aa2cd43b2e10f6bc.zip | |
Fix giving wrong arguments to callEntityDamageEvent. Forgot to update after changing the signature :(
Diffstat (limited to 'src/main/java/net/minecraft/server/MobEffectList.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/MobEffectList.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/MobEffectList.java b/src/main/java/net/minecraft/server/MobEffectList.java index dea14775..4d178290 100644 --- a/src/main/java/net/minecraft/server/MobEffectList.java +++ b/src/main/java/net/minecraft/server/MobEffectList.java @@ -81,7 +81,7 @@ public class MobEffectList { } else if (this.id == POISON.id) { if (entityliving.getHealth() > 1) { // CraftBukkit start - EntityDamageEvent event = CraftEventFactory.callEntityDamageEvent(null, (EntityLiving) entityliving.getBukkitEntity(), DamageCause.POISON, 1); + EntityDamageEvent event = CraftEventFactory.callEntityDamageEvent(null, entityliving, DamageCause.POISON, 1); Bukkit.getPluginManager().callEvent(event); if (!event.isCancelled() && event.getDamage() > 0) { @@ -94,7 +94,7 @@ public class MobEffectList { } else if ((this.id != HEAL.id || entityliving.aE()) && (this.id != HARM.id || !entityliving.aE())) { if (this.id == HARM.id && !entityliving.aE() || this.id == HEAL.id && entityliving.aE()) { // CraftBukkit start - EntityDamageEvent event = CraftEventFactory.callEntityDamageEvent(null, (EntityLiving) entityliving.getBukkitEntity(), DamageCause.MAGIC, 6 << i); + EntityDamageEvent event = CraftEventFactory.callEntityDamageEvent(null, entityliving, DamageCause.MAGIC, 6 << i); Bukkit.getPluginManager().callEvent(event); if (!event.isCancelled() && event.getDamage() > 0) { |