From ff9b6fd98af0eb37c00566a0cf9201a02e9780ce Mon Sep 17 00:00:00 2001 From: gmcferrin Date: Thu, 26 Jan 2012 17:09:38 -0500 Subject: [PATCH] Fix for [Issue #48] - Combat XP Gain --- src/main/java/com/gmail/nossr50/Combat.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/Combat.java index feefa161d..6b58b1aca 100644 --- a/src/main/java/com/gmail/nossr50/Combat.java +++ b/src/main/java/com/gmail/nossr50/Combat.java @@ -106,9 +106,9 @@ public class Combat int hpLeft = defender.getHealth(), xpinc = 0; if(hpLeft < event.getDamage()) - xpinc = event.getDamage(); - else xpinc = hpLeft; + else + xpinc = event.getDamage; int xp = (int) (xpinc * 2 * LoadProperties.pvpxprewardmodifier); @@ -380,9 +380,9 @@ public class Combat int hpLeft = le.getHealth(), xpinc = 0; if(hpLeft < event.getDamage()) - xpinc = event.getDamage(); - else xpinc = hpLeft; + else + xpinc = event.getDamage(); if(entity instanceof Animals) {