Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)

2021-12-20 23:46:51 +01:00
parent 8a5d6d18f8
commit eee1f6a0e0
19 changed files with 91 additions and 112 deletions
--- a/patches/server/Complete-resource-pack-API.patch
+++ b/patches/server/Complete-resource-pack-API.patch
@@ -46,6 +46,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
     public CraftPlayer(CraftServer server, ServerPlayer entity) {
         super(server, entity);
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ 
+     @Override
+     public void setResourcePack(String url) {
+-        this.setResourcePack(url, null);
+        this.setResourcePack(url, (byte[]) null);
+     }
+ 
+     @Override
+@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public boolean getAffectsSpawning() {
         return this.getHandle().affectsSpawning;
     }