EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 23:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bug where some combat skills weren't taking into account all

Browse Source 
damage modifiers.
This commit is contained in:
GJ 2012-03-20 13:22:39 -04:00
parent 6afcce4b7c
commit 9e604aed5e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gmail/nossr50/Combat.java
View File

@ -47,7 +47,6 @@ public class Combat {
Entity damager = event.getDamager(); Entity damager = event.getDamager();
LivingEntity target = (LivingEntity) event.getEntity(); LivingEntity target = (LivingEntity) event.getEntity();
int damage = event.getDamage();
EntityType damagerType = damager.getType(); EntityType damagerType = damager.getType();
EntityType targetType = target.getType(); EntityType targetType = target.getType();
@ -65,7 +64,7 @@ public class Combat {
} }
if (PPa.getSerratedStrikesMode()) { 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); startGainXp(attacker, PPa, target, SkillType.SWORDS, plugin);
@ -84,7 +83,7 @@ public class Combat {
} }
if (PPa.getSkullSplitterMode()) { 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); startGainXp(attacker, PPa, target, SkillType.AXES, plugin);
@ -95,7 +94,7 @@ public class Combat {
} }
if (PPa.getBerserkMode() && mcPermissions.getInstance().berserk(attacker)) { 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)) { if (targetType.equals(EntityType.PLAYER) && mcPermissions.getInstance().disarm(attacker)) {