From 85fe839e918d39b888dadd5def658c112f78f653 Mon Sep 17 00:00:00 2001
From: TheYeti <admin@theyeticave.net>
Date: Thu, 26 Jan 2012 15:19:07 -0800
Subject: [PATCH] Update changelog and fix for Jenkins build #4

---
 Changelog.txt                               | 5 +++++
 src/main/java/com/gmail/nossr50/Combat.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 68ba8190a..46f2a1768 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -2,6 +2,11 @@ Changelog:
 #Versions without changelogs probably had very small misc fixes, like tweaks to the source code
 
 Version 1.2.08
+ - Changes in combat exp (Pull Request #49)
+ - Repair for bows & leather armor (Pull Request #46)
+ - Fixed missing images (Pull Request #45)
+ - POM Changes for dependencies (Pull Request #36)
+ - Fishing & Repair fixes (Pull Request #31)
  - Fixed CraftOfflinePlayer issue (Issue #212) errors for offline wolf owners
  - Pull in commit from @NuclearW for issue from previous commit
 
diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/Combat.java
index 6b58b1aca..f41f7da0a 100644
--- a/src/main/java/com/gmail/nossr50/Combat.java
+++ b/src/main/java/com/gmail/nossr50/Combat.java
@@ -108,7 +108,7 @@ public class Combat
 				      			if(hpLeft < event.getDamage())
 				      				xpinc = hpLeft;
 				      			else
-				      				xpinc = event.getDamage;
+				      				xpinc = event.getDamage();
 				      			
 			    				int xp = (int) (xpinc * 2 * LoadProperties.pvpxprewardmodifier);