[Auto] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
d75d8a38 #549: Add Fluid types / tags

CraftBukkit Changes:
890130b46 #746: Add Fluid types / tags
This commit is contained in:
Aikar
2020-09-14 05:57:06 -04:00
parent d35903e6fa
commit 613bdc3f96
38 changed files with 88 additions and 88 deletions

View File

@@ -5,10 +5,10 @@ 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 1515e2a0cfacd31cd9d848acd785bb5ece26fb30..653994ae4d73542b3f3bd0f24dded8a6a4269546 100644
index b653e94497c2c3da0b1ba343acb56039b95b89b4..b5e1ae8efb7165547e228d2c9d6d84a72b772df5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1704,6 +1704,7 @@ public final class CraftServer implements Server {
@@ -1706,6 +1706,7 @@ public final class CraftServer implements Server {
return helpMap;
}