diff options
| author | Zach Brown <[email protected]> | 2017-04-20 08:22:08 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2017-04-20 08:22:40 -0500 |
| commit | d5cf14188a5580e86e52fa6d909e35f2269f8818 (patch) | |
| tree | 3c25ab5802e042b465cf3d82ba3b760b2e268e24 /Spigot-Server-Patches/0067-Complete-resource-pack-API.patch | |
| parent | 63beca49fef9c31a08effee7b23977b1157a2408 (diff) | |
| download | Paper-d5cf14188a5580e86e52fa6d909e35f2269f8818.tar.gz Paper-d5cf14188a5580e86e52fa6d909e35f2269f8818.zip | |
Update upstream B/CB
Diffstat (limited to 'Spigot-Server-Patches/0067-Complete-resource-pack-API.patch')
| -rw-r--r-- | Spigot-Server-Patches/0067-Complete-resource-pack-API.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch index 2108399f91..a4e8fa7da7 100644 --- a/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch @@ -1,14 +1,14 @@ -From c8f3da57d4793c642fc45ffb746e43eaa12a34a0 Mon Sep 17 00:00:00 2001 +From 44dab017dbfb0913ce29eb02f54337766b9c38d6 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 fd2c0c4f2..e0cc33924 100644 +index 57879c76d..b67837dd2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1028,7 +1028,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1029,7 +1029,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit start public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) { PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.x()); @@ -71,5 +71,5 @@ index d72ff0af2..5fd5e39fa 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.12.1.windows.1 +2.12.2.windows.2 |