From f99e5e015d8b1b8e9b66e5b8f9ced284a3bd65d4 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Sun, 10 Nov 2013 12:42:29 -0800
Subject: [PATCH] Add checks to rectify the potential for negative XP

Fixes #1573
---
 .../gmail/nossr50/util/HardcoreManager.java   | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java
index 188dde443..afd8bd0e5 100644
--- a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java
+++ b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java
@@ -3,6 +3,7 @@ package com.gmail.nossr50.util;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -37,6 +38,14 @@ public final class HardcoreManager {
 
             playerProfile.modifySkill(skillType, playerSkillLevel - levelsLost);
             playerProfile.removeXp(skillType, xpLost);
+
+            if (playerProfile.getSkillXpLevel(skillType) < 0) {
+                playerProfile.setSkillXpLevel(skillType, 0);
+            }
+
+            if (playerProfile.getSkillLevel(skillType) < 0) {
+                playerProfile.modifySkill(skillType, 0);
+            }
         }
 
         player.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PlayerDeath", totalLevelsLost));
@@ -45,7 +54,8 @@ public final class HardcoreManager {
     public static void invokeVampirism(Player killer, Player victim) {
         double vampirismStatLeechPercentage = Config.getInstance().getHardcoreVampirismStatLeechPercentage();
 
-        PlayerProfile killerProfile = UserManager.getPlayer(killer).getProfile();
+        McMMOPlayer killerPlayer = UserManager.getPlayer(killer);
+        PlayerProfile killerProfile = killerPlayer.getProfile();
         PlayerProfile victimProfile = UserManager.getPlayer(victim).getProfile();
         int totalLevelsStolen = 0;
 
@@ -69,11 +79,19 @@ public final class HardcoreManager {
 
             totalLevelsStolen += levelsStolen;
 
-            killerProfile.modifySkill(skillType, killerSkillLevel + levelsStolen);
-            killerProfile.addXp(skillType, xpStolen);
+            killerPlayer.addLevels(skillType, levelsStolen);
+            killerPlayer.beginUnsharedXpGain(skillType, xpStolen);
 
             victimProfile.modifySkill(skillType, victimSkillLevel - levelsStolen);
             victimProfile.removeXp(skillType, xpStolen);
+
+            if (victimProfile.getSkillXpLevel(skillType) < 0) {
+                victimProfile.setSkillXpLevel(skillType, 0);
+            }
+
+            if (victimProfile.getSkillLevel(skillType) < 0) {
+                victimProfile.modifySkill(skillType, 0);
+            }
         }
 
         if (totalLevelsStolen > 0) {