Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

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

@@ -1,4 +1,4 @@
-From caef5c99c37e68d746b563cc248943463a85b85f Mon Sep 17 00:00:00 2001
+From 42df6ba4080ca38d5f94a1a44d5f25b23044d70f 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 0ac8f52..1648d0e 100644
+index 89fb069..b482592 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -548,6 +548,12 @@ public final class CraftServer implements Server {
+@@ -547,6 +547,12 @@ public final class CraftServer implements Server {
          if (commandMap.dispatch(sender, commandLine)) {
              return true;
          }
@@ -48,7 +48,7 @@ index 0ac8f52..1648d0e 100644
  
          sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
  
-@@ -1403,15 +1409,27 @@ public final class CraftServer implements Server {
+@@ -1402,15 +1408,27 @@ public final class CraftServer implements Server {
          }
          // Spigot End
  
@@ -80,7 +80,7 @@ index 0ac8f52..1648d0e 100644
  
      public List<String> tabCompleteChat(Player player, String message) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 19f2822..56767ac 100644
+index cfddd28..ca2e054 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,7 @@ import java.io.IOException;
@@ -318,5 +318,5 @@ index 0000000..a6c76cc
 +    }
 +}
 -- 
-1.8.3.2
+1.8.4.msysgit.0