diff --git a/Spigot-Server-Patches/0034-Improve-Network-Manager-packet-handling.patch b/Spigot-Server-Patches/0034-Improve-Network-Manager-packet-handling.patch deleted file mode 100644 index 005b7b5f37..0000000000 --- a/Spigot-Server-Patches/0034-Improve-Network-Manager-packet-handling.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cad30db92a21978282fda86eed2351308d6b05e2 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Fri, 28 Nov 2014 13:12:00 -0600 -Subject: [PATCH] Improve Network Manager packet handling - -Removes an unnecessary "peek at head of queue" - -diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index e34f0f1..146ab2e 100644 ---- a/src/main/java/net/minecraft/server/NetworkManager.java -+++ b/src/main/java/net/minecraft/server/NetworkManager.java -@@ -144,9 +144,10 @@ public class NetworkManager extends SimpleChannelInboundHandler { - - private void m() { - if (this.i != null && this.i.isOpen()) { -- while (!this.h.isEmpty()) { -- QueuedPacket queuedpacket = (QueuedPacket) this.h.poll(); -- -+ // PaperSpigot start - Improve Network Manager packet handling -+ QueuedPacket queuedpacket; -+ while ((queuedpacket = (QueuedPacket) this.h.poll()) != null) { -+ // PaperSpigot end - this.a(QueuedPacket.a(queuedpacket), QueuedPacket.b(queuedpacket)); - } - --- -1.9.1 - diff --git a/Spigot-Server-Patches/0035-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0034-Only-refresh-abilities-if-needed.patch similarity index 94% rename from Spigot-Server-Patches/0035-Only-refresh-abilities-if-needed.patch rename to Spigot-Server-Patches/0034-Only-refresh-abilities-if-needed.patch index f5cb4bae9b..5fb6a4cbe6 100644 --- a/Spigot-Server-Patches/0035-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0034-Only-refresh-abilities-if-needed.patch @@ -1,4 +1,4 @@ -From c035fcfc6ef7cfa40c1d9dff75a10aeceb785ee4 Mon Sep 17 00:00:00 2001 +From 5b4cf49b42198e46038ba4f9a2e1c2ef2448ec76 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Nov 2014 13:20:22 -0600 Subject: [PATCH] Only refresh abilities if needed diff --git a/Spigot-Server-Patches/0036-Player-lookup-improvements.patch b/Spigot-Server-Patches/0035-Player-lookup-improvements.patch similarity index 99% rename from Spigot-Server-Patches/0036-Player-lookup-improvements.patch rename to Spigot-Server-Patches/0035-Player-lookup-improvements.patch index 1b0988add3..f37378f2a3 100644 --- a/Spigot-Server-Patches/0036-Player-lookup-improvements.patch +++ b/Spigot-Server-Patches/0035-Player-lookup-improvements.patch @@ -1,4 +1,4 @@ -From dd7b5db563cfdbfb9be6651a9309afcf1d8f1cc6 Mon Sep 17 00:00:00 2001 +From 5b2eb900e278b76b5d0af2090c94b38268d53d6d Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Nov 2014 13:43:11 -0600 Subject: [PATCH] Player lookup improvements diff --git a/Spigot-Server-Patches/0037-Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/0036-Configurable-game-mechanics-changes.patch similarity index 97% rename from Spigot-Server-Patches/0037-Configurable-game-mechanics-changes.patch rename to Spigot-Server-Patches/0036-Configurable-game-mechanics-changes.patch index a6046d6373..093b810fd8 100644 --- a/Spigot-Server-Patches/0037-Configurable-game-mechanics-changes.patch +++ b/Spigot-Server-Patches/0036-Configurable-game-mechanics-changes.patch @@ -1,4 +1,4 @@ -From 1047923869dc8cfbb3ae4663d55032aadb53e932 Mon Sep 17 00:00:00 2001 +From 2647dbcf916a6057974c1d1c9829e4e9ef92c988 Mon Sep 17 00:00:00 2001 From: gsand Date: Fri, 28 Nov 2014 13:53:48 -0600 Subject: [PATCH] Configurable game mechanics changes diff --git a/Spigot-Server-Patches/0038-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0037-Add-async-chunk-load-API.patch similarity index 95% rename from Spigot-Server-Patches/0038-Add-async-chunk-load-API.patch rename to Spigot-Server-Patches/0037-Add-async-chunk-load-API.patch index d0f6062c9e..2a28e5ed77 100644 --- a/Spigot-Server-Patches/0038-Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/0037-Add-async-chunk-load-API.patch @@ -1,4 +1,4 @@ -From 50704068d790dafc8d9a67c1569a21f97f329bb5 Mon Sep 17 00:00:00 2001 +From db86ee788914fcad73bf309cd9f8bfc65f05d03e Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 6 Nov 2014 18:29:20 -0600 Subject: [PATCH] Add async chunk load API diff --git a/Spigot-Server-Patches/0039-Configurable-TNT-water-movement.patch b/Spigot-Server-Patches/0038-Configurable-TNT-water-movement.patch similarity index 95% rename from Spigot-Server-Patches/0039-Configurable-TNT-water-movement.patch rename to Spigot-Server-Patches/0038-Configurable-TNT-water-movement.patch index 53413088d7..13d3793dfc 100644 --- a/Spigot-Server-Patches/0039-Configurable-TNT-water-movement.patch +++ b/Spigot-Server-Patches/0038-Configurable-TNT-water-movement.patch @@ -1,4 +1,4 @@ -From 26fd68239de5e9c930d7f0e5ebbbc4e7a0c473f9 Mon Sep 17 00:00:00 2001 +From 62c665061563f8debb863ef56b76d0d9c0ed9cca Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sat, 29 Nov 2014 23:05:52 -0800 Subject: [PATCH] Configurable TNT water movement diff --git a/Spigot-Server-Patches/0040-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch b/Spigot-Server-Patches/0039-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch similarity index 97% rename from Spigot-Server-Patches/0040-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch rename to Spigot-Server-Patches/0039-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch index a972d6f967..e348268e14 100644 --- a/Spigot-Server-Patches/0040-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch +++ b/Spigot-Server-Patches/0039-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch @@ -1,4 +1,4 @@ -From e8247725af871a8acef3db45c6ea71747d9e938f Mon Sep 17 00:00:00 2001 +From 87c9534ecac33e20a0e530adfa9e3c97b019e8f4 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 30 Nov 2014 18:58:07 -0600 Subject: [PATCH] Allow specified ItemStacks to retain their invalid data diff --git a/Spigot-Server-Patches/0041-Add-TNT-source-location-API.patch b/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch similarity index 99% rename from Spigot-Server-Patches/0041-Add-TNT-source-location-API.patch rename to Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch index 1b99e6195f..aaec2191ff 100644 --- a/Spigot-Server-Patches/0041-Add-TNT-source-location-API.patch +++ b/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch @@ -1,4 +1,4 @@ -From 7aa294e6e9b3972f9a0c84522312ca3944eb0a9f Mon Sep 17 00:00:00 2001 +From bb79ef26be9066a993bc21a81a53161e75596914 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 30 Nov 2014 22:57:18 -0600 Subject: [PATCH] Add TNT source location API diff --git a/Spigot-Server-Patches/0042-Add-a-constructor-for-setting-header-and-footer.patch b/Spigot-Server-Patches/0041-Add-a-constructor-for-setting-header-and-footer.patch similarity index 94% rename from Spigot-Server-Patches/0042-Add-a-constructor-for-setting-header-and-footer.patch rename to Spigot-Server-Patches/0041-Add-a-constructor-for-setting-header-and-footer.patch index d77d1d9868..47d07b26ee 100644 --- a/Spigot-Server-Patches/0042-Add-a-constructor-for-setting-header-and-footer.patch +++ b/Spigot-Server-Patches/0041-Add-a-constructor-for-setting-header-and-footer.patch @@ -1,4 +1,4 @@ -From 5524edc7e5c314b762f8f81aaaccdca084763fc8 Mon Sep 17 00:00:00 2001 +From 2b1b2245d21bb6791cd6c8371bc4d5849c9a5fdb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 5 Dec 2014 22:44:50 -0600 Subject: [PATCH] Add a constructor for setting header and footer