Explorar el Código

Fix NPE with Scoreboards when updating

nossr50 hace 4 años
padre
commit
fc3e580550

+ 1 - 0
Changelog.txt

@@ -1,4 +1,5 @@
 Version 2.1.182
+    Fixed a NPE with Scoreboards enabled when trying to update scoreboards
     Players now receive XP from harvesting Sweet Berry bushes (double XP for harvesting fully grown berries)
     Sweet Berry Bush will no longer ready tools for Super Abilities
     You can now use '.all' (for example: mcmmo.perks.xp.customboost.all) to give an XP perk to all skills

+ 8 - 6
src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java

@@ -428,14 +428,16 @@ public class ScoreboardWrapper {
      * Load new values into the sidebar.
      */
     private void updateSidebar() {
-        try {
-            updateTask.cancel();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
+        if(updateTask != null) {
+            try {
+                updateTask.cancel();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            updateTask = null;
         }
 
-        updateTask = null;
 
         if (sidebarType == SidebarType.NONE) {
             return;