From 2e2d432d117299f6d8a82752dbb77d0a967eaf1a Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Fri, 28 Feb 2014 15:42:28 -0800
Subject: [PATCH] Removed the /fill command as an alias of /material.

Fixes WORLDEDIT-3016.
---
 CHANGELOG.txt                                                   | 2 ++
 .../java/com/sk89q/worldedit/commands/ToolUtilCommands.java     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 90f76bfce..ebd3276a1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -26,6 +26,8 @@
 - Added usage of non-existent variables in all LValue expressions.
 - Changed /up and /ceil command to use glass block by default. Flight can be 
   done via -f flag now.
+- Removed the /fill command as an alias of /material (which sets the brush
+  material).
 - Fixed //deform not doing anything at all.
 - Fixed //walls on non-cuboid regions so that they no longer introduces gaps 
   in walls beyond 45 degrees.
diff --git a/src/main/java/com/sk89q/worldedit/commands/ToolUtilCommands.java b/src/main/java/com/sk89q/worldedit/commands/ToolUtilCommands.java
index 15959ec23..18ed67f9a 100644
--- a/src/main/java/com/sk89q/worldedit/commands/ToolUtilCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/ToolUtilCommands.java
@@ -109,7 +109,7 @@ public class ToolUtilCommands {
     }
 
     @Command(
-        aliases = { "mat", "material", "fill" },
+        aliases = { "mat", "material" },
         usage = "[pattern]",
         desc = "Set the brush material",
         min = 1,