diff options
Diffstat (limited to 'Spigot-Server-Patches/0066-Complete-resource-pack-API.patch')
| -rw-r--r-- | Spigot-Server-Patches/0066-Complete-resource-pack-API.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch index 9c6d26d205..185dc305a1 100644 --- a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch @@ -1,30 +1,29 @@ -From f723b9fa6313d76c8e15f7d597be8e3c0bcac1ae Mon Sep 17 00:00:00 2001 +From e8e13c91dda2297f85ab4adc890637f4848409fe Mon Sep 17 00:00:00 2001 From: Jedediah Smith <[email protected]> Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2fb1a3d..87e0707 100644 +index 358d5d3b..f30a9ad6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1019,7 +1019,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { - +@@ -1020,7 +1020,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit start public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) { + PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.x()); - this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()])); -+ //this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()])); // Paper - comment + // Paper start -+ PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.x()); ++ //this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()])); + final PlayerResourcePackStatusEvent.Status status = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()]; + this.getPlayer().setResourcePackStatus(status); + this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), status)); -+ // paper end ++ // Paper end } // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a1e46ef..15da24d 100644 +index a1e46efe..15da24d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -74,6 +74,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -72,5 +71,5 @@ index a1e46ef..15da24d 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.9.3 +2.12.0.windows.1 |