Merge pull request #10 from Xorgon/master

Fixed NPE when removing entries from an IndexedObjective.
SupaHam · Jun 17, 2021 · 75a5210 · 75a5210
2 parents f142b96 + 0d158d0
commit 75a5210
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/commons-bukkit/src/main/java/com/supaham/commons/bukkit/scoreboards/IndexedObjective.java b/commons-bukkit/src/main/java/com/supaham/commons/bukkit/scoreboards/IndexedObjective.java
@@ -118,8 +118,8 @@ public String put(int index, String string) {
    * @return the removed entry
    */
   public String remove(int index) {
-    String old = entries[validateIndex(index)].getPrefix();
-    this.scoreboard.getBukkitScoreboard().getTeams().remove(entries[validateIndex(index)]);
+    String old = (entries[validateIndex(index)] != null) ? entries[validateIndex(index)].getPrefix() : null;
+    entries[validateIndex(index)].unregister();
     entries[index] = null;
     return old;
   }