diff --git a/MinecraftClient/Commands/AutoAttack.cs b/MinecraftClient/Commands/AutoAttack.cs
new file mode 100644
index 00000000..e9663497
--- /dev/null
+++ b/MinecraftClient/Commands/AutoAttack.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MinecraftClient.Commands
+{
+    class AutoAttack : Command
+    {
+        public override string CMDName { get { return "autoattack"; } }
+        public override string CMDDesc { get { return "autoattack <on|off>: Enable/disable auto attack mobs."; } }
+
+        public override string Run(McTcpClient handler, string command)
+        {
+            if (hasArg(command))
+            {
+                string state = getArg(command);
+                if (state.ToLower() == "on")
+                {
+                    if (!handler.AutoAttack)
+                    {
+                        handler.AutoAttack = true;
+                        return "Auto attack turned on.";
+                    }
+                    else
+                    {
+                        return "Auto attack is on.";
+                    }
+                }else if (state.ToLower() == "off")
+                {
+                    if (handler.AutoAttack)
+                    {
+                        handler.AutoAttack = false;
+                        return "Auto attack turned off.";
+                    }
+                    else
+                    {
+                        return "Auto attack is off.";
+                    }
+                }
+                return "";
+            }
+            else return CMDDesc;
+        }
+    }
+}
diff --git a/MinecraftClient/MinecraftClient.csproj b/MinecraftClient/MinecraftClient.csproj
index 82f2fd5d..54e9e3ad 100644
--- a/MinecraftClient/MinecraftClient.csproj
+++ b/MinecraftClient/MinecraftClient.csproj
@@ -79,7 +79,6 @@
     <Compile Include="ChatBots\AutoRelog.cs" />
     <Compile Include="ChatBots\ChatLog.cs" />
     <Compile Include="ChatBots\HangmanGame.cs" />
-    <Compile Include="ChatBots\kill.cs" />
     <Compile Include="ChatBots\PlayerListLogger.cs" />
     <Compile Include="ChatBots\RemoteControl.cs" />
     <Compile Include="ChatBots\Script.cs" />
@@ -87,6 +86,7 @@
     <Compile Include="ChatBots\TestBot.cs" />
     <Compile Include="ChatBot.cs" />
     <Compile Include="Command.cs" />
+    <Compile Include="Commands\AutoAttack.cs" />
     <Compile Include="Commands\Connect.cs" />
     <Compile Include="Commands\Debug.cs" />
     <Compile Include="Commands\Look.cs" />