Merge branch 'scoreboard' of SteamWar/SpigotCore into master

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

@@ -41,8 +41,10 @@ public class SWScoreboard {
         return true;
     }
 
-    public boolean removeScoreboard(Player player) {
+    public static boolean removeScoreboard(Player player) {
-        if(playerBoards.containsKey(player)) {
+        if(!playerBoards.containsKey(player))
+            return false;
+
         switch (Core.getVersion()) {
             case 8:
                 ((SWScoreboard_8) playerBoards.get(player)).deleteScoreboard(player);
@@ -68,8 +70,6 @@ public class SWScoreboard {
         playerBoards.remove(player);
         return true;
     }
-        return false;
-    }
 
     //Scoreboard Updater
     static {