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

Trying to resolve conflicts

Browse Source
This commit is contained in:
bm01 2012-02-27 03:19:47 +01:00
parent ed8e2ab8b9
commit 1920433dc9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ public class Combat
if(PPa.getFistsPreparationMode()) if(PPa.getFistsPreparationMode())
Unarmed.berserkActivationCheck(attacker, PPa); Unarmed.berserkActivationCheck(attacker, PPa);
damage += Unarmed.unarmedBonus(PPa); damage += Unarmed.unarmedBonus(PPa.getSkillLevel(SkillType.UNARMED));
if(PPa.getBerserkMode()) if(PPa.getBerserkMode())
damage *= 1.5; damage *= 1.5;

4
src/main/java/com/gmail/nossr50/skills/Unarmed.java
View File

@ -54,12 +54,12 @@ public class Unarmed
} }
} }
public static int unarmedBonus(PlayerProfile PPa) public static int unarmedBonus(int skillLevel)
{ {
int bonus = 3; int bonus = 3;
//Add 1 DMG for every 50 skill levels //Add 1 DMG for every 50 skill levels
bonus += PPa.getSkillLevel(SkillType.UNARMED)/50; bonus += skillLevel / 50;
if(bonus > 8) if(bonus > 8)
bonus = 8; bonus = 8;