Update upstream

2016-06-22 22:18:41 -04:00
parent a656161705
commit 0973e46de1
121 changed files with 386 additions and 531 deletions
--- a/Spigot-Server-Patches/0061-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0061-Expose-server-CommandMap.patch
@@ -0,0 +1,21 @@
+From f13c3a2728d644b624656810efa02069d44ec301 Mon Sep 17 00:00:00 2001
+From: kashike <kashike@vq.lc>
+Date: Thu, 3 Mar 2016 02:15:57 -0600
+Subject: [PATCH] Expose server CommandMap
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 73f5ea0..07a69d7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1561,6 +1561,7 @@ public final class CraftServer implements Server {
+         return helpMap;
+     }
+ 
+    @Override // Paper - add override
+     public SimpleCommandMap getCommandMap() {
+         return commandMap;
+     }
+-- 
+2.9.0
+