1 files changed, 9 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/command/defaults/EffectCommand.java b/src/main/java/org/bukkit/command/defaults/EffectCommand.java
index bfa5b2a5..8d9b7425 100644
--- a/src/main/java/org/bukkit/command/defaults/EffectCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/EffectCommand.java
@@ -16,7 +16,7 @@ public class EffectCommand extends VanillaCommand {
     public EffectCommand() {
         super("effect");
         this.description = "Adds/Removes effects on players";
-        this.usageMessage = "/effect <player> <effect> [seconds] [amplifier]";
+        this.usageMessage = "/effect <player> <effect|clear> [seconds] [amplifier]";
         this.setPermission("bukkit.command.effect");
     }
 
@@ -50,6 +50,14 @@ public class EffectCommand extends VanillaCommand {
             return true;
         }
 
+        if ("clear".equalsIgnoreCase(args[1])) {
+            for (PotionEffect effect : player.getActivePotionEffects()) {
+                player.removePotionEffect(effect.getType());
+            }
+            sender.sendMessage(String.format("Took all effects from %s", args[0]));
+            return true;
+        }
+
         PotionEffectType effect = PotionEffectType.getByName(args[1]);
 
         if (effect == null) {