Upstream update

This commit is contained in:
Aikar
2017-07-26 21:12:40 -04:00
parent 43543c78c4
commit dcd4f3710f
17 changed files with 124 additions and 73 deletions

View File

@@ -1,14 +1,14 @@
From ef145db068f267aab4ff3186a61977f2b236aa9c Mon Sep 17 00:00:00 2001
From 9c9ce99fe37dfa1dce089637e821156ca4d68f37 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 589c67a6c..8af41ea66 100644
index 1090ee35e..5055ab6d3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1552,6 +1552,7 @@ public final class CraftServer implements Server {
@@ -1547,6 +1547,7 @@ public final class CraftServer implements Server {
return helpMap;
}
@@ -17,5 +17,5 @@ index 589c67a6c..8af41ea66 100644
return commandMap;
}
--
2.13.2
2.13.0