diff --git a/Spigot-Server-Patches/0078-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0078-Reduce-IO-ops-opening-a-new-region-file.patch index d22ead78b..501d25ab6 100644 --- a/Spigot-Server-Patches/0078-Reduce-IO-ops-opening-a-new-region-file.patch +++ b/Spigot-Server-Patches/0078-Reduce-IO-ops-opening-a-new-region-file.patch @@ -1,11 +1,11 @@ -From 74d31b94b3c55fb528d39b03051961a31e3b4e4b Mon Sep 17 00:00:00 2001 +From 299ea42df7d2ad51015e65dbbf5bb77a3d4f4e09 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 06:56:23 +0300 Subject: [PATCH] Reduce IO ops opening a new region file. diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index fb529eac91..3aeac69c26 100644 +index fb529eac9..faf425588 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -26,7 +26,7 @@ public class RegionFile implements AutoCloseable { @@ -26,7 +26,7 @@ index fb529eac91..3aeac69c26 100644 + while (header.hasRemaining()) { + if (this.getDataFile().getChannel().read(header) == -1) throw new java.io.EOFException(); + } -+ header.clear(); ++ ((java.nio.Buffer) header).clear(); + java.nio.IntBuffer headerAsInts = header.asIntBuffer(); + // Paper End + diff --git a/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch index dab686041..06458a78e 100644 --- a/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From a8ff3e42fb3f25826b75e3309adb27dcb4804b39 Mon Sep 17 00:00:00 2001 +From 34e2a8960d67bda57cbaafad5086bc2f520f327a Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Feb 2019 01:08:19 -0500 Subject: [PATCH] Allow Saving of Oversized Chunks @@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns to a jar with this fix, the data will be restored. diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java -index 9fd8a75dae..d49afd622e 100644 +index 9fd8a75da..d49afd622 100644 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java @@ -69,6 +69,7 @@ public class NBTCompressedStreamTools { @@ -51,7 +51,7 @@ index 9fd8a75dae..d49afd622e 100644 a((NBTBase) nbttagcompound, dataoutput); } diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java -index b7c94fe238..80eea5dfbd 100644 +index b7c94fe23..80eea5dfb 100644 --- a/src/main/java/net/minecraft/server/NBTTagList.java +++ b/src/main/java/net/minecraft/server/NBTTagList.java @@ -11,7 +11,7 @@ import java.util.Objects; @@ -64,7 +64,7 @@ index b7c94fe238..80eea5dfbd 100644 public NBTTagList() {} diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 17648c1c04..86ae53fed3 100644 +index e90ef45ee..ccc3d6c7a 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -23,7 +23,7 @@ public class RegionFile implements AutoCloseable { @@ -86,7 +86,7 @@ index 17648c1c04..86ae53fed3 100644 this.b.write(RegionFile.a); @@ -66,6 +67,7 @@ public class RegionFile implements AutoCloseable { } - header.clear(); + ((java.nio.Buffer) header).clear(); java.nio.IntBuffer headerAsInts = header.asIntBuffer(); + initOversizedState(); // Paper End @@ -286,7 +286,7 @@ index 17648c1c04..86ae53fed3 100644 + } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 8718811655..c53518a477 100644 +index 871881165..c53518a47 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -47,6 +47,7 @@ public abstract class RegionFileCache implements AutoCloseable { diff --git a/Spigot-Server-Patches/0407-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0407-Avoid-hopper-searches-if-there-are-no-items.patch index e44c3766a..0ea5e94fd 100644 --- a/Spigot-Server-Patches/0407-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0407-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From 04b4cf7404c1f7d9375bfc892904c172847f5372 Mon Sep 17 00:00:00 2001 +From a788e2b42ef19a7ef34ee11da916bdf578a8eb9a Mon Sep 17 00:00:00 2001 From: CullanP Date: Thu, 3 Mar 2016 02:13:38 -0600 Subject: [PATCH] Avoid hopper searches if there are no items @@ -13,7 +13,6 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear Combined, this adds up a lot. - diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index d604f96c1..67dc837f4 100644 --- a/src/main/java/net/minecraft/server/Chunk.java diff --git a/Spigot-Server-Patches/0407-Fixed-MC-156852.patch b/Spigot-Server-Patches/0408-Fixed-MC-156852.patch similarity index 92% rename from Spigot-Server-Patches/0407-Fixed-MC-156852.patch rename to Spigot-Server-Patches/0408-Fixed-MC-156852.patch index 8542282b7..519a64648 100644 --- a/Spigot-Server-Patches/0407-Fixed-MC-156852.patch +++ b/Spigot-Server-Patches/0408-Fixed-MC-156852.patch @@ -1,4 +1,4 @@ -From 73127de4ba34855c821c62e59dd18f47b89bcd04 Mon Sep 17 00:00:00 2001 +From 6e3e4c0d0ef13a74817402992dc91eeb14611941 Mon Sep 17 00:00:00 2001 From: TheGreatKetchup Date: Thu, 1 Aug 2019 21:24:30 -0400 Subject: [PATCH] Fixed MC-156852 @@ -12,7 +12,7 @@ issue in 1.8-1.12. Originally solved by Gnembon on MC-5694 at bugs.mojang.com diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index e5e9de542..3e338ad45 100644 +index e5e9de542..c96564a59 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -218,6 +218,7 @@ public class PlayerInteractManager { @@ -24,5 +24,5 @@ index e5e9de542..3e338ad45 100644 this.l = j; } -- -2.17.1 +2.22.0 diff --git a/Spigot-Server-Patches/0407-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0409-Implement-alternative-item-despawn-rate.patch similarity index 98% rename from Spigot-Server-Patches/0407-Implement-alternative-item-despawn-rate.patch rename to Spigot-Server-Patches/0409-Implement-alternative-item-despawn-rate.patch index c747a6651..04a7a9d58 100644 --- a/Spigot-Server-Patches/0407-Implement-alternative-item-despawn-rate.patch +++ b/Spigot-Server-Patches/0409-Implement-alternative-item-despawn-rate.patch @@ -1,4 +1,4 @@ -From a9aa741fe50c486d64fc85fd060b604a562f6c54 Mon Sep 17 00:00:00 2001 +From 5356f6eb7d8023a1e71837b544ef89f745274aaf Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 3 Jun 2019 02:02:39 -0400 Subject: [PATCH] Implement alternative item-despawn-rate