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

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);

2
src/main/java/com/gmail/nossr50/util/Misc.java
View File

@ -264,6 +264,7 @@ public class Misc {
* @return whichever value is lower
*/
public static int skillCheck(int skillLevel, int maxLevel) {
//TODO: Could we just use Math.min(skillLevel, maxLevel) here?
if (skillLevel > maxLevel) {
return maxLevel;
}
@ -288,3 +289,4 @@ public class Misc {
}
}
}