Update upstream B/CB

This commit is contained in:
Zach Brown
2016-08-07 00:01:31 -05:00
parent 01a09f8ff1
commit 15f3ca7ecb
12 changed files with 48 additions and 48 deletions

View File

@@ -1,14 +1,14 @@
From a91cf68943834508930b5314c6cc67c15484194e Mon Sep 17 00:00:00 2001
From 25e6aa19756ac7da6b70ebf5c66db4ed53f7eb97 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
index fdbf02b..f3bad60 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 {
@@ -1557,6 +1557,7 @@ public final class CraftServer implements Server {
return helpMap;
}
@@ -17,5 +17,5 @@ index 73f5ea0..07a69d7 100644
return commandMap;
}
--
2.9.0
2.9.2.windows.1