diff --git a/patches/server/0017-Player-invulnerabilities.patch b/patches/server/0017-Player-invulnerabilities.patch index 08ef0dd4c..0b13a8141 100644 --- a/patches/server/0017-Player-invulnerabilities.patch +++ b/patches/server/0017-Player-invulnerabilities.patch @@ -67,14 +67,14 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3 public Scoreboard getScoreboard() { return getBukkitEntity().getScoreboard().getHandle(); diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 85964e7fe2cc96ad3b967dadd9ee5d095ee60e2a..71ab9f136144aa7b06494144671b41e2af85de48 100644 +index 85964e7fe2cc96ad3b967dadd9ee5d095ee60e2a..937983f27bf11634ccb9044d5dff42e7d77ec9ba 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -1901,6 +1901,7 @@ public class PlayerConnection implements PacketListenerPlayIn { PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer()); // Paper start PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()]; -+ player.setFrozen(packStatus == PlayerResourcePackStatusEvent.Status.ACCEPTED); // Purpur ++ if (player.world.purpurConfig.playerInvulnerableWhileAcceptingResourcePack) player.setFrozen(packStatus == PlayerResourcePackStatusEvent.Status.ACCEPTED); // Purpur player.getBukkitEntity().setResourcePackStatus(packStatus); this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus)); // Paper end diff --git a/patches/server/0020-Alternative-Keepalive-Handling.patch b/patches/server/0020-Alternative-Keepalive-Handling.patch index f28870709..9cd35844d 100644 --- a/patches/server/0020-Alternative-Keepalive-Handling.patch +++ b/patches/server/0020-Alternative-Keepalive-Handling.patch @@ -17,7 +17,7 @@ index b4c37287362907b8507d156b978ba5b9d961bb7b..9e6e6636539702507abb78515e002819 return this.a; } diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 71ab9f136144aa7b06494144671b41e2af85de48..a0a476d55afdf5ed9850368e99ab25af019075a8 100644 +index 937983f27bf11634ccb9044d5dff42e7d77ec9ba..1ca7f6cd38bde55bbea762d5ea7e9b73b735c92b 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -233,6 +233,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0046-Signs-allow-color-codes.patch b/patches/server/0046-Signs-allow-color-codes.patch index 69a096a64..e0a7ddf29 100644 --- a/patches/server/0046-Signs-allow-color-codes.patch +++ b/patches/server/0046-Signs-allow-color-codes.patch @@ -17,7 +17,7 @@ index b336e47b21a0693ebfeae8eb752258a3e2f6d4f4..7128e72f6496768293d305bdecb1f1f3 this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition())); } diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index a0a476d55afdf5ed9850368e99ab25af019075a8..3559f52e2fa30a8a7600334ece981fe34896bd68 100644 +index 1ca7f6cd38bde55bbea762d5ea7e9b73b735c92b..b685d23a4fabd6a09187a26b5a0bdb6b00b5893e 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -3078,6 +3078,15 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0084-Allow-color-codes-in-books.patch b/patches/server/0084-Allow-color-codes-in-books.patch index 1b4f978de..b0b9b3977 100644 --- a/patches/server/0084-Allow-color-codes-in-books.patch +++ b/patches/server/0084-Allow-color-codes-in-books.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 3559f52e2fa30a8a7600334ece981fe34896bd68..9998f20c9cc9857612f94f91d27e77da9c632323 100644 +index b685d23a4fabd6a09187a26b5a0bdb6b00b5893e..6970deaaf638428f1a90d5841b656a59e2f8ee71 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -1216,7 +1216,8 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0085-Entity-lifespan.patch b/patches/server/0085-Entity-lifespan.patch index 1b59ab544..bcacfd26f 100644 --- a/patches/server/0085-Entity-lifespan.patch +++ b/patches/server/0085-Entity-lifespan.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 9998f20c9cc9857612f94f91d27e77da9c632323..4e43cd877c45a014add62547a4dbfadbd09082d2 100644 +index 6970deaaf638428f1a90d5841b656a59e2f8ee71..319b7b2b62fc4646591b29e3045f81b2df8a6a7b 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -2463,6 +2463,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0103-Ridables.patch b/patches/server/0103-Ridables.patch index 3ec40034a..0c05cd528 100644 --- a/patches/server/0103-Ridables.patch +++ b/patches/server/0103-Ridables.patch @@ -116,7 +116,7 @@ index ff704bc64146584d3e8085b332bada39912f71f3..faf6140085454b4e29869d6abe08353b return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 4e43cd877c45a014add62547a4dbfadbd09082d2..bf6c040cfe68f96fa25511967091677abdaf4f0e 100644 +index 319b7b2b62fc4646591b29e3045f81b2df8a6a7b..e30485236f947010a1c79ab7e704e0dd49b5ef60 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -2472,6 +2472,8 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0155-PlayerBookTooLargeEvent.patch b/patches/server/0155-PlayerBookTooLargeEvent.patch index d49560e55..aa595fd3a 100644 --- a/patches/server/0155-PlayerBookTooLargeEvent.patch +++ b/patches/server/0155-PlayerBookTooLargeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index bf6c040cfe68f96fa25511967091677abdaf4f0e..fbfb3eba79ded3720edf93b3d1c18cbc02c086dd 100644 +index e30485236f947010a1c79ab7e704e0dd49b5ef60..91ceb9995ba04b3e42c2dc20de5bcbd553aca7f2 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -1128,6 +1128,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0173-Dont-run-with-scissors.patch b/patches/server/0173-Dont-run-with-scissors.patch index 370a0f796..e867d901f 100644 --- a/patches/server/0173-Dont-run-with-scissors.patch +++ b/patches/server/0173-Dont-run-with-scissors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors! diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index fbfb3eba79ded3720edf93b3d1c18cbc02c086dd..0bed1f132200876122f92f0ca539e53afa222c14 100644 +index 91ceb9995ba04b3e42c2dc20de5bcbd553aca7f2..d19cf0a3e0dbc46a2017de08bcf6e07619bc3a53 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -1552,6 +1552,12 @@ public class PlayerConnection implements PacketListenerPlayIn {