Trying to resolve conflicts

2025-07-24 16:15:27 +02:00 · 2012-02-27 03:19:47 +01:00
parent ed8e2ab8b9
commit 1920433dc9
2 changed files with 3 additions and 3 deletions
--- a/src/main/java/com/gmail/nossr50/Combat.java
+++ b/src/main/java/com/gmail/nossr50/Combat.java
@@ -101,7 +101,7 @@ public class Combat
 					if(PPa.getFistsPreparationMode())
 						Unarmed.berserkActivationCheck(attacker, PPa);
 					
-					damage += Unarmed.unarmedBonus(PPa);
+					damage += Unarmed.unarmedBonus(PPa.getSkillLevel(SkillType.UNARMED));
 					
 					if(PPa.getBerserkMode())
 						damage *= 1.5;