From 78157bd2ac709de6d6fbd4b8559cbf0649f42504 Mon Sep 17 00:00:00 2001 From: jack lin Date: Mon, 28 Jul 2014 18:31:01 +1200 Subject: [PATCH] Fixed Generic warning, General Clean up * Fixed Warning: A generic array of HashSet is created for a varargs parameter * Cleaned Imports * Removed unnecessary toggle message --- src/com/projectkorra/ProjectKorra/Commands.java | 7 +------ src/com/projectkorra/ProjectKorra/Methods.java | 2 +- src/com/projectkorra/ProjectKorra/PKListener.java | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/com/projectkorra/ProjectKorra/Commands.java b/src/com/projectkorra/ProjectKorra/Commands.java index 40b3320d..4bf46d0d 100644 --- a/src/com/projectkorra/ProjectKorra/Commands.java +++ b/src/com/projectkorra/ProjectKorra/Commands.java @@ -5,8 +5,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -466,10 +464,6 @@ public class Commands { BendingPlayer bPlayer = Methods.getBendingPlayer(s.getName()); - if (isToggledForAll) { - s.sendMessage(ChatColor.DARK_RED + "Bending has been toggled off for all players. You may not use this command until after it is turned back on."); - return true; - } if (bPlayer.isToggled) { s.sendMessage(ChatColor.RED + "Your bending has been toggled off. You will not be able to use most abilities until you toggle it back."); bPlayer.isToggled = false; @@ -500,6 +494,7 @@ public class Commands { } } else { s.sendMessage(ChatColor.GOLD + "Proper Usage: /bending toggle "); + return true; } } if (Arrays.asList(whoaliases).contains(args[0].toLowerCase())) { diff --git a/src/com/projectkorra/ProjectKorra/Methods.java b/src/com/projectkorra/ProjectKorra/Methods.java index 7107d915..58ad182e 100644 --- a/src/com/projectkorra/ProjectKorra/Methods.java +++ b/src/com/projectkorra/ProjectKorra/Methods.java @@ -1475,7 +1475,7 @@ public class Methods { } public static boolean isHarmlessAbility(String ability) { - return Arrays.asList(AbilityModuleManager.harmlessabilities).contains(ability); + return AbilityModuleManager.harmlessabilities.contains(ability); } public static boolean isRegionProtectedFromBuild(Player player, diff --git a/src/com/projectkorra/ProjectKorra/PKListener.java b/src/com/projectkorra/ProjectKorra/PKListener.java index 07af543d..82098385 100644 --- a/src/com/projectkorra/ProjectKorra/PKListener.java +++ b/src/com/projectkorra/ProjectKorra/PKListener.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.Location;