From 9e604aed5e8ca869b7264da1df1ecd1185a24b51 Mon Sep 17 00:00:00 2001 From: GJ Date: Tue, 20 Mar 2012 13:22:39 -0400 Subject: [PATCH] Fixed bug where some combat skills weren't taking into account all damage modifiers. --- src/main/java/com/gmail/nossr50/Combat.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/Combat.java index bbca8ae03..9e63281d5 100644 --- a/src/main/java/com/gmail/nossr50/Combat.java +++ b/src/main/java/com/gmail/nossr50/Combat.java @@ -47,7 +47,6 @@ public class Combat { Entity damager = event.getDamager(); LivingEntity target = (LivingEntity) event.getEntity(); - int damage = event.getDamage(); EntityType damagerType = damager.getType(); EntityType targetType = target.getType(); @@ -65,7 +64,7 @@ public class Combat { } if (PPa.getSerratedStrikesMode()) { - applyAbilityAoE(attacker, target, damage, plugin, SkillType.SWORDS); + applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.SWORDS); } startGainXp(attacker, PPa, target, SkillType.SWORDS, plugin); @@ -84,7 +83,7 @@ public class Combat { } if (PPa.getSkullSplitterMode()) { - applyAbilityAoE(attacker, target, damage, plugin, SkillType.AXES); + applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.AXES); } startGainXp(attacker, PPa, target, SkillType.AXES, plugin); @@ -95,7 +94,7 @@ public class Combat { } if (PPa.getBerserkMode() && mcPermissions.getInstance().berserk(attacker)) { - event.setDamage((int) (damage * 1.5)); + event.setDamage((int) (event.getDamage() * 1.5)); } if (targetType.equals(EntityType.PLAYER) && mcPermissions.getInstance().disarm(attacker)) {