From 930fc42fad1b610b6c01492dbc98635c8666a388 Mon Sep 17 00:00:00 2001 From: Xorgon Date: Thu, 17 Jun 2021 03:26:27 +0100 Subject: [PATCH 1/2] Fixed NPE when removing entries from an IndexedObjective. --- .../supaham/commons/bukkit/scoreboards/IndexedObjective.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 0e97481..ed3c1b1 100644 --- 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,7 +118,7 @@ public String put(int index, String string) { * @return the removed entry */ public String remove(int index) { - String old = entries[validateIndex(index)].getPrefix(); + String old = (entries[validateIndex(index)] != null) ? entries[validateIndex(index)].getPrefix() : null; this.scoreboard.getBukkitScoreboard().getTeams().remove(entries[validateIndex(index)]); entries[index] = null; return old; From 0d158d0453bbac5c3c2e8b73ca73c969791915ac Mon Sep 17 00:00:00 2001 From: Xorgon Date: Thu, 17 Jun 2021 05:02:52 +0100 Subject: [PATCH 2/2] Fixed incorrect removal method for IndexedObjective. --- .../supaham/commons/bukkit/scoreboards/IndexedObjective.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index ed3c1b1..0d5d671 100644 --- 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 @@ -119,7 +119,7 @@ public String put(int index, String string) { */ public String remove(int index) { String old = (entries[validateIndex(index)] != null) ? entries[validateIndex(index)].getPrefix() : null; - this.scoreboard.getBukkitScoreboard().getTeams().remove(entries[validateIndex(index)]); + entries[validateIndex(index)].unregister(); entries[index] = null; return old; }