EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

More reworking of Unarmed, renamed ArcheryBonusDamageEventHandler for

Browse Source 
clarity's sake.
This commit is contained in:
GJ
2012-06-14 23:29:08 -04:00
parent 77b4aaa50d
commit 48dd537257
9 changed files with 96 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/util/Combat.java
View File

@ -34,7 +34,6 @@ import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
import com.gmail.nossr50.skills.archery.ArcheryManager;
import com.gmail.nossr50.skills.combat.Axes;
import com.gmail.nossr50.skills.combat.Swords;
import com.gmail.nossr50.skills.combat.Unarmed;
import com.gmail.nossr50.skills.taming.TamingManager;
import com.gmail.nossr50.skills.unarmed.UnarmedManager;
@ -135,9 +134,7 @@ public class Combat {
UnarmedManager unarmedManager = new UnarmedManager(attacker);
if (permInstance.unarmedBonus(attacker)) {
Unarmed.unarmedBonus(PPa, event);
}
unarmedManager.bonusDamage(event);
if (PPa.getAbilityMode(AbilityType.BERSERK) && permInstance.berserk(attacker)) {
event.setDamage((int) (event.getDamage() * 1.5));
@ -254,7 +251,8 @@ public class Combat {
if (defender.getItemInHand().getType().equals(Material.AIR)) {
if (configInstance.getUnarmedPVP()) {
Unarmed.deflectCheck(defender, event);
UnarmedManager unarmedManager = new UnarmedManager(defender);
unarmedManager.deflectCheck(event);
}
}
}