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

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 6d9003e1f97d638a50b48620edb6ab096cc0d808..aab8a4edc172f23773464e17da77c623088b55a8 100644
index 45c64a9e4f20428a9a448194f22697a17dfb8e1f..b3cd3e5288bdcdd928efb8cba97f504d8e3ec58e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1961,5 +1961,14 @@ public final class Bukkit {
@@ -24,7 +24,7 @@ index 6d9003e1f97d638a50b48620edb6ab096cc0d808..aab8a4edc172f23773464e17da77c623
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 53f7ab9245fdcb45a7e55778d1941233a46a3005..6bb74e60705e6ea91c0ea06c6ea3f5348718a9ce 100644
index 91641c358b10219d4098f40b53ea56f1cfa5defc..f546e3422539d91f1fcb98c94a722c4b17ef0170 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1733,5 +1733,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi