From fad6c476fe2d72c613b50ab50095108e984ada56 Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@gmail.com>
Date: Thu, 15 Nov 2012 23:03:03 -0500
Subject: [PATCH] Remove unnecessary Overrides in Default commands.

---
 src/main/java/org/bukkit/command/defaults/BanCommand.java    | 5 -----
 src/main/java/org/bukkit/command/defaults/BanIpCommand.java  | 5 -----
 .../java/org/bukkit/command/defaults/BanListCommand.java     | 5 -----
 src/main/java/org/bukkit/command/defaults/ClearCommand.java  | 5 -----
 .../org/bukkit/command/defaults/DefaultGameModeCommand.java  | 5 -----
 src/main/java/org/bukkit/command/defaults/DeopCommand.java   | 5 -----
 .../java/org/bukkit/command/defaults/DifficultyCommand.java  | 5 -----
 src/main/java/org/bukkit/command/defaults/ExpCommand.java    | 5 -----
 .../java/org/bukkit/command/defaults/GameModeCommand.java    | 5 -----
 .../java/org/bukkit/command/defaults/GameRuleCommand.java    | 5 -----
 src/main/java/org/bukkit/command/defaults/GiveCommand.java   | 5 -----
 src/main/java/org/bukkit/command/defaults/KickCommand.java   | 5 -----
 src/main/java/org/bukkit/command/defaults/KillCommand.java   | 5 -----
 src/main/java/org/bukkit/command/defaults/ListCommand.java   | 5 -----
 src/main/java/org/bukkit/command/defaults/MeCommand.java     | 5 -----
 src/main/java/org/bukkit/command/defaults/OpCommand.java     | 5 -----
 src/main/java/org/bukkit/command/defaults/PardonCommand.java | 5 -----
 .../java/org/bukkit/command/defaults/PardonIpCommand.java    | 5 -----
 src/main/java/org/bukkit/command/defaults/SaveCommand.java   | 5 -----
 .../java/org/bukkit/command/defaults/SaveOffCommand.java     | 5 -----
 src/main/java/org/bukkit/command/defaults/SaveOnCommand.java | 5 -----
 src/main/java/org/bukkit/command/defaults/SayCommand.java    | 5 -----
 .../java/org/bukkit/command/defaults/SpawnpointCommand.java  | 5 -----
 src/main/java/org/bukkit/command/defaults/StopCommand.java   | 5 -----
 .../java/org/bukkit/command/defaults/TeleportCommand.java    | 5 -----
 src/main/java/org/bukkit/command/defaults/TimeCommand.java   | 5 -----
 .../org/bukkit/command/defaults/ToggleDownfallCommand.java   | 5 -----
 .../java/org/bukkit/command/defaults/WeatherCommand.java     | 5 -----
 .../java/org/bukkit/command/defaults/WhitelistCommand.java   | 5 -----
 29 files changed, 145 deletions(-)

diff --git a/src/main/java/org/bukkit/command/defaults/BanCommand.java b/src/main/java/org/bukkit/command/defaults/BanCommand.java
index c4366524..69b12135 100644
--- a/src/main/java/org/bukkit/command/defaults/BanCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/BanCommand.java
@@ -39,11 +39,6 @@ public class BanCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("ban");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/BanIpCommand.java b/src/main/java/org/bukkit/command/defaults/BanIpCommand.java
index 8ea0c356..0d7b2997 100644
--- a/src/main/java/org/bukkit/command/defaults/BanIpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/BanIpCommand.java
@@ -54,11 +54,6 @@ public class BanIpCommand extends VanillaCommand {
         Command.broadcastCommandMessage(sender, "Banned IP Address " + ip);
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("ban-ip");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/BanListCommand.java b/src/main/java/org/bukkit/command/defaults/BanListCommand.java
index 08c5be9a..45f2ea03 100644
--- a/src/main/java/org/bukkit/command/defaults/BanListCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/BanListCommand.java
@@ -56,9 +56,4 @@ public class BanListCommand extends VanillaCommand {
         }
         return ImmutableList.of();
     }
-
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("banlist");
-    }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/ClearCommand.java b/src/main/java/org/bukkit/command/defaults/ClearCommand.java
index ecbce018..02d1e505 100644
--- a/src/main/java/org/bukkit/command/defaults/ClearCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ClearCommand.java
@@ -69,11 +69,6 @@ public class ClearCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("clear");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/DefaultGameModeCommand.java b/src/main/java/org/bukkit/command/defaults/DefaultGameModeCommand.java
index 9557b097..77ba6783 100644
--- a/src/main/java/org/bukkit/command/defaults/DefaultGameModeCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/DefaultGameModeCommand.java
@@ -22,11 +22,6 @@ public class DefaultGameModeCommand extends VanillaCommand {
         this.setPermission("bukkit.command.defaultgamemode");
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase(this.getName());
-    }
-
     @Override
     public boolean execute(CommandSender sender, String commandLabel, String[] args) {
         if (!testPermission(sender)) return true;
diff --git a/src/main/java/org/bukkit/command/defaults/DeopCommand.java b/src/main/java/org/bukkit/command/defaults/DeopCommand.java
index 8815e134..1b71d493 100644
--- a/src/main/java/org/bukkit/command/defaults/DeopCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/DeopCommand.java
@@ -41,11 +41,6 @@ public class DeopCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("deop");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/DifficultyCommand.java b/src/main/java/org/bukkit/command/defaults/DifficultyCommand.java
index 05b10001..ca985595 100644
--- a/src/main/java/org/bukkit/command/defaults/DifficultyCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/DifficultyCommand.java
@@ -66,11 +66,6 @@ public class DifficultyCommand extends VanillaCommand {
         }
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("difficulty");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/ExpCommand.java b/src/main/java/org/bukkit/command/defaults/ExpCommand.java
index ffbfbaa3..27497600 100644
--- a/src/main/java/org/bukkit/command/defaults/ExpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ExpCommand.java
@@ -75,11 +75,6 @@ public class ExpCommand extends VanillaCommand {
         return false;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("xp");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/GameModeCommand.java b/src/main/java/org/bukkit/command/defaults/GameModeCommand.java
index 95593d71..c58f9067 100644
--- a/src/main/java/org/bukkit/command/defaults/GameModeCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/GameModeCommand.java
@@ -82,11 +82,6 @@ public class GameModeCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("gamemode");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/GameRuleCommand.java b/src/main/java/org/bukkit/command/defaults/GameRuleCommand.java
index 774d23ba..e1de4afc 100644
--- a/src/main/java/org/bukkit/command/defaults/GameRuleCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/GameRuleCommand.java
@@ -66,11 +66,6 @@ public class GameRuleCommand extends VanillaCommand {
         return Bukkit.getWorlds().get(0);
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("gamerule");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/GiveCommand.java b/src/main/java/org/bukkit/command/defaults/GiveCommand.java
index 6ebc3eae..9eba11dc 100644
--- a/src/main/java/org/bukkit/command/defaults/GiveCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/GiveCommand.java
@@ -74,11 +74,6 @@ public class GiveCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("give");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/KickCommand.java b/src/main/java/org/bukkit/command/defaults/KickCommand.java
index 7b890b1a..b6c3f79f 100644
--- a/src/main/java/org/bukkit/command/defaults/KickCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/KickCommand.java
@@ -45,11 +45,6 @@ public class KickCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("kick");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/KillCommand.java b/src/main/java/org/bukkit/command/defaults/KillCommand.java
index 90b59816..3270db5f 100644
--- a/src/main/java/org/bukkit/command/defaults/KillCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/KillCommand.java
@@ -39,11 +39,6 @@ public class KillCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("kill");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/ListCommand.java b/src/main/java/org/bukkit/command/defaults/ListCommand.java
index e38ae806..80c6135a 100644
--- a/src/main/java/org/bukkit/command/defaults/ListCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ListCommand.java
@@ -42,11 +42,6 @@ public class ListCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("list");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/MeCommand.java b/src/main/java/org/bukkit/command/defaults/MeCommand.java
index 4ec16baf..ddcd9ad7 100644
--- a/src/main/java/org/bukkit/command/defaults/MeCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/MeCommand.java
@@ -32,9 +32,4 @@ public class MeCommand extends VanillaCommand {
 
         return true;
     }
-
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("me");
-    }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/OpCommand.java b/src/main/java/org/bukkit/command/defaults/OpCommand.java
index d7874bcf..e1f8452a 100644
--- a/src/main/java/org/bukkit/command/defaults/OpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/OpCommand.java
@@ -38,11 +38,6 @@ public class OpCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("op");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/PardonCommand.java b/src/main/java/org/bukkit/command/defaults/PardonCommand.java
index a737ff09..692f0f26 100644
--- a/src/main/java/org/bukkit/command/defaults/PardonCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PardonCommand.java
@@ -34,11 +34,6 @@ public class PardonCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("pardon");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/PardonIpCommand.java b/src/main/java/org/bukkit/command/defaults/PardonIpCommand.java
index 4571eeb9..689a0bda 100644
--- a/src/main/java/org/bukkit/command/defaults/PardonIpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PardonIpCommand.java
@@ -38,11 +38,6 @@ public class PardonIpCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("pardon-ip");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/SaveCommand.java b/src/main/java/org/bukkit/command/defaults/SaveCommand.java
index 77839c1c..8a44f9cd 100644
--- a/src/main/java/org/bukkit/command/defaults/SaveCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SaveCommand.java
@@ -35,11 +35,6 @@ public class SaveCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("save-all");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/SaveOffCommand.java b/src/main/java/org/bukkit/command/defaults/SaveOffCommand.java
index c081e5e1..1fbb3f00 100644
--- a/src/main/java/org/bukkit/command/defaults/SaveOffCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SaveOffCommand.java
@@ -30,11 +30,6 @@ public class SaveOffCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("save-off");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/SaveOnCommand.java b/src/main/java/org/bukkit/command/defaults/SaveOnCommand.java
index d0561c36..9774f673 100644
--- a/src/main/java/org/bukkit/command/defaults/SaveOnCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SaveOnCommand.java
@@ -30,11 +30,6 @@ public class SaveOnCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("save-on");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/SayCommand.java b/src/main/java/org/bukkit/command/defaults/SayCommand.java
index 651b60c0..427897ff 100644
--- a/src/main/java/org/bukkit/command/defaults/SayCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SayCommand.java
@@ -44,11 +44,6 @@ public class SayCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("say");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/SpawnpointCommand.java b/src/main/java/org/bukkit/command/defaults/SpawnpointCommand.java
index c15508e9..d58054dd 100644
--- a/src/main/java/org/bukkit/command/defaults/SpawnpointCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SpawnpointCommand.java
@@ -66,11 +66,6 @@ public class SpawnpointCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("spawnpoint");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/StopCommand.java b/src/main/java/org/bukkit/command/defaults/StopCommand.java
index c6a470b6..2c12e1e6 100644
--- a/src/main/java/org/bukkit/command/defaults/StopCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/StopCommand.java
@@ -27,11 +27,6 @@ public class StopCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("stop");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/TeleportCommand.java b/src/main/java/org/bukkit/command/defaults/TeleportCommand.java
index 75d072ef..2a18efe5 100644
--- a/src/main/java/org/bukkit/command/defaults/TeleportCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TeleportCommand.java
@@ -110,11 +110,6 @@ public class TeleportCommand extends VanillaCommand {
         return result;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("tp");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/TimeCommand.java b/src/main/java/org/bukkit/command/defaults/TimeCommand.java
index 011d32db..86083b4a 100644
--- a/src/main/java/org/bukkit/command/defaults/TimeCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TimeCommand.java
@@ -72,11 +72,6 @@ public class TimeCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("time");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/ToggleDownfallCommand.java b/src/main/java/org/bukkit/command/defaults/ToggleDownfallCommand.java
index 08ed667f..ac78bfba 100644
--- a/src/main/java/org/bukkit/command/defaults/ToggleDownfallCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ToggleDownfallCommand.java
@@ -45,11 +45,6 @@ public class ToggleDownfallCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("toggledownfall");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/WeatherCommand.java b/src/main/java/org/bukkit/command/defaults/WeatherCommand.java
index 07e93c51..a39c1b07 100644
--- a/src/main/java/org/bukkit/command/defaults/WeatherCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/WeatherCommand.java
@@ -58,11 +58,6 @@ public class WeatherCommand extends VanillaCommand {
         return true;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("weather");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
         Validate.notNull(sender, "Sender cannot be null");
diff --git a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
index 70786d11..04a24c5e 100644
--- a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
@@ -93,11 +93,6 @@ public class WhitelistCommand extends VanillaCommand {
         return false;
     }
 
-    @Override
-    public boolean matches(String input) {
-        return input.equalsIgnoreCase("whitelist");
-    }
-
     @Override
     public List<String> tabComplete(CommandSender sender, String alias, String[] args) {
         Validate.notNull(sender, "Sender cannot be null");