From 06cb4d208801e276a0e4d96252c00ae01d9e522d Mon Sep 17 00:00:00 2001
From: BuildTools <james.jenour@protonmail.com>
Date: Sat, 20 Feb 2021 23:37:59 +0800
Subject: charzard just 4 u

---
 .../java/io/github/moulberry/notenoughupdates/util/XPInformation.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
index 0652ee9d..c3535ab4 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
@@ -27,6 +27,7 @@ public class XPInformation {
         public float totalXp;
         public float currentXp;
         public float currentXpMax;
+        public boolean fromApi = false;
     }
 
     private HashMap<String, SkillInfo> skillInfoMap = new HashMap<>();
@@ -68,7 +69,7 @@ public class XPInformation {
                     JsonArray levelingArray = leveling.getAsJsonArray("leveling_xp");
                     for(int i=0; i<levelingArray.size(); i++) {
                         float cap = levelingArray.get(i).getAsFloat();
-                        if(maxXp <= cap) {
+                        if(maxXp > 0 && maxXp <= cap) {
                             break;
                         }
 
@@ -101,6 +102,7 @@ public class XPInformation {
             info.currentXpMax = skillInfo.get("maxxp_skill_"+skill).getAsFloat();
             info.level = (int)level;
             info.currentXp = (level%1)*info.currentXpMax;
+            info.fromApi = true;
 
             skillInfoMap.put(skill.toLowerCase(), info);
         }
-- 
cgit