Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
6ecbe5776 Rename leftover resource->datapack (#5662)
ec90a7859 I give up on trying to teach people to avoid the incorrect ways.
This commit is contained in:
BillyGalbreath
2021-05-17 02:08:40 -05:00
parent 7bfc70d951
commit 5f87a45950
15 changed files with 21 additions and 21 deletions

View File

@@ -41,7 +41,7 @@ index 7eadf925c4e4429fa63fb02af9e87bf2ed68efa6..60ef024891e78e18c64435b7ee811807
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f3e2a6ec37045fae48166682d6cabe513d581833..78599a8b9a6b9876435982ef4c11b84d41a227c8 100644
index e927ebb58e8dfc5333e3ea3ab74242bac9570593..5da39845f3ba82b40a3483333c41b57a2a0c10ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2547,5 +2547,10 @@ public final class CraftServer implements Server {