From 1920433dc98743869154882461334e0340b507a0 Mon Sep 17 00:00:00 2001
From: bm01 <baptiste.marie@orange.fr>
Date: Mon, 27 Feb 2012 03:19:47 +0100
Subject: [PATCH] Trying to resolve conflicts

---
 src/main/java/com/gmail/nossr50/Combat.java         | 2 +-
 src/main/java/com/gmail/nossr50/skills/Unarmed.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/Combat.java
index 59d10660e..ae2ebdd4d 100644
--- 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;
diff --git a/src/main/java/com/gmail/nossr50/skills/Unarmed.java b/src/main/java/com/gmail/nossr50/skills/Unarmed.java
index c0ca8aaee..1cd7d5b43 100644
--- a/src/main/java/com/gmail/nossr50/skills/Unarmed.java
+++ b/src/main/java/com/gmail/nossr50/skills/Unarmed.java
@@ -54,12 +54,12 @@ public class Unarmed
 		}
 	}
 	
-	public static int unarmedBonus(PlayerProfile PPa)
+	public static int unarmedBonus(int skillLevel)
 	{
 		int bonus = 3;
 		
 		//Add 1 DMG for every 50 skill levels
-		bonus += PPa.getSkillLevel(SkillType.UNARMED)/50;
+		bonus += skillLevel / 50;
 		
 		if(bonus > 8)
 			bonus = 8;