Mirrors/mcMMO
1
0
Fork 1
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2026-02-20 18:53:11 +01:00
Code Packages Releases Activity

Updating Unarmed (WIP)

Browse Source
This commit is contained in:
GJ
2012-06-14 21:10:47 -04:00
parent 1014316581
commit 77b4aaa50d
6 changed files with 210 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ 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;
public class Combat {
private static Config configInstance = Config.getInstance();
@@ -132,6 +133,8 @@ public class Combat {
}
}
UnarmedManager unarmedManager = new UnarmedManager(attacker);
if (permInstance.unarmedBonus(attacker)) {
Unarmed.unarmedBonus(PPa, event);
}
@@ -140,8 +143,8 @@ public class Combat {
event.setDamage((int) (event.getDamage() * 1.5));
}
if (targetIsPlayer && permInstance.disarm(attacker)) {
Unarmed.disarmProcCheck(attacker, (Player) target);
if (targetIsPlayer) {
unarmedManager.disarmCheck((Player) target);
}
startGainXp(attacker, PPa, target, SkillType.UNARMED);