diff options
Diffstat (limited to 'patches/server/0061-Complete-resource-pack-API.patch')
| -rw-r--r-- | patches/server/0061-Complete-resource-pack-API.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/patches/server/0061-Complete-resource-pack-API.patch b/patches/server/0061-Complete-resource-pack-API.patch index b03c6b826a..bb5373485e 100644 --- a/patches/server/0061-Complete-resource-pack-API.patch +++ b/patches/server/0061-Complete-resource-pack-API.patch @@ -23,7 +23,7 @@ index 25117f4b7f6139688c1845a1dc257f7d5c268fde..103d0afd73de68e3b07a9a4ef6d2f5af @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1c5d31872ba125f6bc990fedb0c350b2825f301d..27d4b69bc3184869e9b66d1933ceb3fb8f8832ac 100644 +index 00e9f75a065b598358bc049027ee8896e168091f..4cb1cd3bd5905735daab669206d51ebcdecaea10 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -134,6 +134,7 @@ import org.bukkit.metadata.MetadataValue; @@ -45,16 +45,7 @@ index 1c5d31872ba125f6bc990fedb0c350b2825f301d..27d4b69bc3184869e9b66d1933ceb3fb public CraftPlayer(CraftServer server, ServerPlayer entity) { super(server, entity); -@@ -1494,7 +1499,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - - @Override - public void setResourcePack(String url) { -- this.setResourcePack(url, null); -+ this.setResourcePack(url, (byte[]) null); - } - - @Override -@@ -1958,6 +1963,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1973,6 +1978,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public boolean getAffectsSpawning() { return this.getHandle().affectsSpawning; } |