Upstream merge

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch

@@ -1,4 +1,4 @@
-From fc1e8ad76e7fbded89c1277ef6d5a3c21a4583e7 Mon Sep 17 00:00:00 2001
+From ef1c785158ebcb31690699805174834ec2186f6a Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 18 Dec 2013 10:32:15 +1100
 Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
@@ -32,10 +32,10 @@ index e63f17c..e58be15 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 716cb15..07fcf38 100644
+index 0ac8f52..fb346f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -546,6 +546,12 @@ public final class CraftServer implements Server {
+@@ -548,6 +548,12 @@ public final class CraftServer implements Server {
          if (commandMap.dispatch(sender, commandLine)) {
              return true;
          }
@@ -48,7 +48,7 @@ index 716cb15..07fcf38 100644
  
          sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
  
-@@ -1401,15 +1407,23 @@ public final class CraftServer implements Server {
+@@ -1403,15 +1409,23 @@ public final class CraftServer implements Server {
          }
          // Spigot End
  
@@ -314,5 +314,5 @@ index 0000000..a6c76cc
 +    }
 +}
 -- 
-1.8.4.msysgit.0
+1.8.3.2