#306 Remove singleton getters in admin commands

- Note: this commit does not remove all singleton getters
2015-12-26 17:57:53 +01:00
parent 283bb7c113
commit 74ceb66430
15 changed files with 141 additions and 204 deletions
@@ -247,14 +247,14 @@ public final class Utils {
        }
    }

-    @SuppressWarnings("deprecation")
    public static Player getPlayer(String name) {
        name = name.toLowerCase();
        return wrapper.getServer().getPlayer(name);
    }

    public static boolean isNPC(Player player) {
-        return player.hasMetadata("NPC") || plugin.combatTagPlus != null && plugin.combatTagPlus.getNpcPlayerHelper().isNpc(player);
+        return player.hasMetadata("NPC") || plugin.combatTagPlus != null
+            && plugin.combatTagPlus.getNpcPlayerHelper().isNpc(player);
    }

    public static void teleportToSpawn(Player player) {