SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java

@@ -41,34 +41,34 @@ public class SWScoreboard {
         return true;
     }
 
-    public boolean removeScoreboard(Player player) {
-        if(playerBoards.containsKey(player)) {
-            switch (Core.getVersion()) {
-                case 8:
-                    ((SWScoreboard_8) playerBoards.get(player)).deleteScoreboard(player);
-                    break;
-                case 9:
-                    ((SWScoreboard_9) playerBoards.get(player)).deleteScoreboard(player);
-                    break;
-                case 10:
-                    ((SWScoreboard_10) playerBoards.get(player)).deleteScoreboard(player);
-                    break;
-                case 12:
-                    ((SWScoreboard_12) playerBoards.get(player)).deleteScoreboard(player);
-                    break;
-                case 14:
-                    ((SWScoreboard_14) playerBoards.get(player)).deleteScoreboard(player);
-                    break;
-                case 15:
-                    ((SWScoreboard_15) playerBoards.get(player)).deleteScoreboard(player);
-                    break;
-                default:
-                    return false;
-            }
-            playerBoards.remove(player);
-            return true;
+    public static boolean removeScoreboard(Player player) {
+        if(!playerBoards.containsKey(player))
+            return false;
+
+        switch (Core.getVersion()) {
+            case 8:
+                ((SWScoreboard_8) playerBoards.get(player)).deleteScoreboard(player);
+                break;
+            case 9:
+                ((SWScoreboard_9) playerBoards.get(player)).deleteScoreboard(player);
+                break;
+            case 10:
+                ((SWScoreboard_10) playerBoards.get(player)).deleteScoreboard(player);
+                break;
+            case 12:
+                ((SWScoreboard_12) playerBoards.get(player)).deleteScoreboard(player);
+                break;
+            case 14:
+                ((SWScoreboard_14) playerBoards.get(player)).deleteScoreboard(player);
+                break;
+            case 15:
+                ((SWScoreboard_15) playerBoards.get(player)).deleteScoreboard(player);
+                break;
+            default:
+                return false;
         }
-        return false;
+        playerBoards.remove(player);
+        return true;
     }
 
     //Scoreboard Updater