Updated Upstream (CraftBukkit/Spigot)

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

CraftBukkit Changes:
f992ce60 Fix duplicate datapack reload on /reload

Spigot Changes:
9472b09d Rebuild patches
This commit is contained in:
Jason Penilla 2021-06-15 01:38:57 -07:00
parent 89860077fa
commit 8291fff4ac
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
32 changed files with 80 additions and 81 deletions

View file

@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
https://github.com/PaperMC/Paper/issues/49
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7e990ec783440ae7ca706bdd315305fe088a7cbe..0147b2b903e59e4689fa1a88f13c06942233379f 100644
index a9ca1e44eca6691e41c6b443f8953e77dbde62b2..610af41f33a41bd0465eace2c3e2b6ed8eeceac7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2256,5 +2256,23 @@ public final class CraftServer implements Server {
@@ -2255,5 +2255,23 @@ public final class CraftServer implements Server {
}
return this.adventure$audiences;
}