Update upstream

This commit is contained in:
Aikar
2018-07-25 19:05:07 -04:00
parent 10ed7dc6b4
commit 8536a71daa
49 changed files with 148 additions and 148 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f3252e20..a291ebd6 100644
index 477a5833..73c85063 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ import org.bukkit.boss.BarColor;
@@ -39,7 +39,7 @@ index f3252e20..a291ebd6 100644
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e6a5cd2a..901199e3 100644
index 1fa6f53e..70e19580 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ import org.bukkit.boss.BarColor;