EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49 from gmcferrin/patch-2

Browse Source 
Fix for [Issue #48] - Combat XP Gain
This commit is contained in:
The Yeti 2012-01-26 15:14:09 -08:00
commit 7e7505381b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,9 +106,9 @@ public class Combat
int hpLeft = defender.getHealth(), xpinc = 0; int hpLeft = defender.getHealth(), xpinc = 0;
if(hpLeft < event.getDamage()) if(hpLeft < event.getDamage())
xpinc = event.getDamage();
else
xpinc = hpLeft; xpinc = hpLeft;
else
xpinc = event.getDamage;
int xp = (int) (xpinc * 2 * LoadProperties.pvpxprewardmodifier); int xp = (int) (xpinc * 2 * LoadProperties.pvpxprewardmodifier);
@ -380,9 +380,9 @@ public class Combat
int hpLeft = le.getHealth(), xpinc = 0; int hpLeft = le.getHealth(), xpinc = 0;
if(hpLeft < event.getDamage()) if(hpLeft < event.getDamage())
xpinc = event.getDamage();
else
xpinc = hpLeft; xpinc = hpLeft;
else
xpinc = event.getDamage();
if(entity instanceof Animals) if(entity instanceof Animals)
{ {