better cache

2020-04-18 17:57:03 +08:00
parent 86e68e7f60
commit d2674b1d4a
24 changed files with 131 additions and 129 deletions
--- a/patches/api/0001-POM-Changes.patch
+++ b/patches/api/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 88c462e64d3468d0ad87e6f8271e4e434a8f06d1 Mon Sep 17 00:00:00 2001
+From ef19a5cdf803c60b840540c9c61accca961fe8eb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 14 Dec 2018 21:52:29 -0800
@@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes


 diff --git a/pom.xml b/pom.xml
-index 2cb971408..d167304be 100644
+index 2cb97140..d167304b 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -3,18 +3,18 @@
@@ -35,5 +35,5 @@ index 2cb971408..d167304be 100644
 
     <properties>
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/api/0002-Add-server-configuration.patch
+++ b/patches/api/0002-Add-server-configuration.patch
@@ -1,4 +1,4 @@
-From 0fc740d0df7c774c0ad30c4c35f9e42104fec802 Mon Sep 17 00:00:00 2001
+From 297ce321a17608b758c4b2d8b00f15dc2984ec6d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 15:18:38 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Add server configuration


 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 93d5a3f97..dfb57b9db 100644
+index 93d5a3f9..dfb57b9d 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -207,6 +207,7 @@ class TimingsExport extends Thread {
@@ -18,7 +18,7 @@ index 93d5a3f97..dfb57b9db 100644
 
         new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9ceaac0e8..17a494b4d 100644
+index 9ceaac0e..17a494b4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -1386,6 +1386,14 @@ public interface Server extends PluginMessageRecipient {
@@ -37,5 +37,5 @@ index 9ceaac0e8..17a494b4d 100644
          * Sends the component to the player
          *
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch
+++ b/patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch
@@ -1,11 +1,11 @@
-From 8505e57f361d6996f04d62cda5d4e7abfa21c477 Mon Sep 17 00:00:00 2001
+From 53046222580d1b8ab5abf950474e04fbb7b469fb Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 00:52:56 +0700
 Subject: [PATCH] Fix errors on editors and add ignores


 diff --git a/.gitignore b/.gitignore
-index 67fb370cad..9b89663438 100644
+index 67fb370ca..9b8966343 100644
 --- a/.gitignore
 +++ b/.gitignore
@@ -2,6 +2,7 @@
@@ -17,7 +17,7 @@ index 67fb370cad..9b89663438 100644
 # netbeans
 /nbproject
 diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
-index 9ebd7ecb7a..677ccffd00 100644
+index 9ebd7ecb7..677ccffd0 100644
 --- a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
 +++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
@@ -76,7 +76,7 @@ public final class PlayerMobDistanceMap {
@@ -30,7 +30,7 @@ index 9ebd7ecb7a..677ccffd00 100644
             final PooledHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> map = entry.getValue();
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
-index f625da9f09..3f128565b4 100644
+index f625da9f0..3f128565b 100644
 --- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
 +++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
@@ -134,10 +134,10 @@ public abstract class AreaMap<E> {
@@ -47,5 +47,5 @@ index f625da9f09..3f128565b4 100644
             final PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<E> map = entry.getValue();
 
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0002-Akarin-POM-changes.patch
+++ b/patches/server/0002-Akarin-POM-changes.patch
@@ -1,4 +1,4 @@
-From 9d54a44af2e2a6263bdb8148cc57a14789f955f3 Mon Sep 17 00:00:00 2001
+From 9ef8c6991bb852a356245afb1ed1e6977e8c34ce Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 14 Dec 2018 21:53:58 -0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Akarin POM changes


 diff --git a/pom.xml b/pom.xml
-index 55679af926..19f87edb55 100644
+index 55679af92..19f87edb5 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -1,12 +1,11 @@
@@ -67,7 +67,7 @@ index 55679af926..19f87edb55 100644
                 </configuration>
                 <executions>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 674096cab1..9a7235b8e5 100644
+index 674096cab..9a7235b8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning {
@@ -80,5 +80,5 @@ index 674096cab1..9a7235b8e5 100644
 
         if (stream != null) {
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0003-Akarin-configuration.patch
+++ b/patches/server/0003-Akarin-configuration.patch
@@ -1,4 +1,4 @@
-From af45e8fbc44d0d72619b5b7b9596587aa7b8026f Mon Sep 17 00:00:00 2001
+From 149a02a4f64b6d1fded947d53a4550e9732e343e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 14:59:22 +0800
@@ -7,7 +7,7 @@ Subject: [PATCH] Akarin configuration

 diff --git a/src/main/java/io/akarin/server/Config.java b/src/main/java/io/akarin/server/Config.java
 new file mode 100644
-index 0000000000..2ac8f02a97
+index 000000000..2ac8f02a9
 --- /dev/null
 +++ b/src/main/java/io/akarin/server/Config.java
@@ -0,0 +1,183 @@
@@ -195,7 +195,7 @@ index 0000000000..2ac8f02a97
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 1ef7890da5..9d82885dcf 100644
+index 1ef7890da..9d82885dc 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -194,6 +194,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -207,7 +207,7 @@ index 1ef7890da5..9d82885dcf 100644
         this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
         this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d554d4cf0f..839ddb14ef 100644
+index d554d4cf0..839ddb14e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -82,6 +82,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -228,7 +228,7 @@ index d554d4cf0f..839ddb14ef 100644
         this.world = new CraftWorld((WorldServer) this, gen, env);
         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8cc0f66ce5..ed684cc0d5 100644
+index 8cc0f66ce..ed684cc0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -806,6 +806,7 @@ public final class CraftServer implements Server {
@@ -263,7 +263,7 @@ index 8cc0f66ce5..ed684cc0d5 100644
         public void restart() {
             org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index cb60310e63..04694464b1 100644
+index cb60310e6..04694464b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -138,6 +138,14 @@ public class Main {
@@ -282,5 +282,5 @@ index cb60310e63..04694464b1 100644
                 acceptsAll(asList("server-name"), "Name of the server")
                         .withRequiredArg()
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0004-Akarin-brand-changes.patch
+++ b/patches/server/0004-Akarin-brand-changes.patch
@@ -1,4 +1,4 @@
-From 55081a981c3d77acb0064c456ba4235b6d317285 Mon Sep 17 00:00:00 2001
+From 5e0412cac58685905d67438d3d6da85ac5b17e25 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Tue, 18 Dec 2018 06:27:02 -0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Akarin brand changes


 diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
-index cf00f35a5b..a45e63a027 100644
+index cf00f35a5..a45e63a02 100644
 --- a/src/main/java/net/minecraft/server/EULA.java
 +++ b/src/main/java/net/minecraft/server/EULA.java
@@ -70,7 +70,7 @@ public class EULA {
@@ -19,7 +19,7 @@ index cf00f35a5b..a45e63a027 100644
                     throwable = throwable1;
                     throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a9b5337512..c562c8ce7f 100644
+index a9b533751..c562c8ce7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1511,7 +1511,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -32,7 +32,7 @@ index a9b5337512..c562c8ce7f 100644
 
     public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ed684cc0d5..765b865b85 100644
+index ed684cc0d..765b865b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -203,7 +203,7 @@ import javax.annotation.Nullable; // Paper
@@ -45,5 +45,5 @@ index ed684cc0d5..765b865b85 100644
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0005-Akarin-Metrics.patch
+++ b/patches/server/0005-Akarin-Metrics.patch
@@ -1,4 +1,4 @@
-From 5cd3b220a579a05bb64dd9140f0d237b290d01db Mon Sep 17 00:00:00 2001
+From c982217379f86ab27dd3fd04d5fed3ca57b0cc37 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Mon, 13 Apr 2020 13:18:27 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Akarin Metrics


 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index e257d6b36e..81f0aef68c 100644
+index e257d6b36..81f0aef68 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -578,7 +578,7 @@ public class Metrics {
@@ -19,5 +19,5 @@ index e257d6b36e..81f0aef68c 100644
                 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                     String minecraftVersion = Bukkit.getVersion();
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0006-Disable-the-Snooper.patch
+++ b/patches/server/0006-Disable-the-Snooper.patch
@@ -1,11 +1,11 @@
-From 5463d79e92c4b8aa8161b93f89272e088f42e633 Mon Sep 17 00:00:00 2001
+From f86852c95674cd7052effb5c77efb8101b073354 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 22:17:18 +0700
 Subject: [PATCH] Disable the Snooper


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c562c8ce7f..63865f767b 100644
+index c562c8ce7..63865f767 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1169,6 +1169,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -26,5 +26,5 @@ index c562c8ce7f..63865f767b 100644
         this.methodProfiler.exit();
         this.methodProfiler.enter("tallying");
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0007-Avoid-double-I-O-operation-on-load-player-file.patch
+++ b/patches/server/0007-Avoid-double-I-O-operation-on-load-player-file.patch
@@ -1,4 +1,4 @@
-From 234ebaa54d6fdab2c7209218014b5d16af1ee605 Mon Sep 17 00:00:00 2001
+From 12a1f908b01568745becbfeadbc2b39db514bf4e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:29:08 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid double I/O operation on load player file


 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 350ac42d6b..65cc7b2052 100644
+index 350ac42d6..65cc7b205 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -165,7 +165,8 @@ public class WorldNBTStorage implements IPlayerFileData {
@@ -29,5 +29,5 @@ index 350ac42d6b..65cc7b2052 100644
             }
             // Spigot Start
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0008-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
+++ b/patches/server/0008-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch
@@ -1,4 +1,4 @@
-From 02f4e13d761859a8c6c657446e984c0d5d41bf0f Mon Sep 17 00:00:00 2001
+From c1eaa4a319bdac8b0e36da3a0f77d86c2bb4f0ab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:43:20 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't trigger Lootable Refresh for non player interaction


 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index d4cbce3243..0ff6ebbf97 100644
+index d4cbce324..0ff6ebbf9 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
@@ -49,6 +49,7 @@ public abstract class TileEntityLootable extends TileEntityContainer {
@@ -18,5 +18,5 @@ index d4cbce3243..0ff6ebbf97 100644
             LootTable loottable = this.world.getMinecraftServer().getLootTableRegistry().getLootTable(this.lootTable);
 
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0009-Never-drop-items-on-command-give.patch
+++ b/patches/server/0009-Never-drop-items-on-command-give.patch
@@ -1,4 +1,4 @@
-From 248e7b359bcf81957b4310939b177307b74e2e49 Mon Sep 17 00:00:00 2001
+From 9e10846ad746cc3625232c6e808b671d338c56e3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:35:19 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Never drop items on command "/give"


 diff --git a/src/main/java/net/minecraft/server/CommandGive.java b/src/main/java/net/minecraft/server/CommandGive.java
-index 81b26bb4d0..1f3097c945 100644
+index 81b26bb4d..1f3097c94 100644
 --- a/src/main/java/net/minecraft/server/CommandGive.java
 +++ b/src/main/java/net/minecraft/server/CommandGive.java
@@ -36,6 +36,7 @@ public class CommandGive {
@@ -18,5 +18,5 @@ index 81b26bb4d0..1f3097c945 100644
                     itemstack.setCount(1);
                     entityitem = entityplayer.drop(itemstack, false);
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0010-Save-Json-list-asynchronously.patch
+++ b/patches/server/0010-Save-Json-list-asynchronously.patch
@@ -1,4 +1,4 @@
-From 9858a4f599533da9ebc2befca0d03d07f888f072 Mon Sep 17 00:00:00 2001
+From 123a20482feb2e8fbf59c007b729a4eb18d9984a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:16:18 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Save Json list asynchronously


 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index c97be42dd7..370841cad0 100644
+index c97be42dd..370841cad 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
@@ -168,6 +168,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -33,5 +33,5 @@ index c97be42dd7..370841cad0 100644
 
     public void load() throws FileNotFoundException {
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0011-Remove-vanilla-profiler-callers.patch
+++ b/patches/server/0011-Remove-vanilla-profiler-callers.patch
@@ -1,11 +1,11 @@
-From ac3292dd04ee6ac5994bba66ae6f385f58c48047 Mon Sep 17 00:00:00 2001
+From addfa3784039c4fe1b0dee826172a608a4e1e21a Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 22:18:01 +0700
 Subject: [PATCH] Remove vanilla profiler callers


 diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
-index ce653f6b4b..21e28b98b4 100644
+index ce653f6b4..21e28b98b 100644
 --- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
 +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
@@ -271,7 +271,7 @@ public final class PaperTickList<T> extends TickListServer<T> { // extend to avo
@@ -36,7 +36,7 @@ index ce653f6b4b..21e28b98b4 100644
 
         // finished ticking, actual cleanup time
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index f741a034e8..04ffecd061 100644
+index f741a034e..04ffecd06 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -368,9 +368,9 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -206,7 +206,7 @@ index f741a034e8..04ffecd061 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index 2414b0a552..1b0a878d2a 100644
+index 2414b0a55..1b0a878d2 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -168,7 +168,7 @@ public class CommandDispatcher {
@@ -228,7 +228,7 @@ index 2414b0a552..1b0a878d2a 100644
 
         return b0;
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index ee42e1dfa4..68dc7cdfbc 100644
+index ee42e1dfa..68dc7cdfb 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
@@ -58,10 +58,10 @@ public class CustomFunctionData implements IResourcePackListener {
@@ -290,7 +290,7 @@ index ee42e1dfa4..68dc7cdfbc 100644
 
                     ++k;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9cb4e5a1e6..b290f64fa1 100644
+index 9cb4e5a1e..b290f64fa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -395,7 +395,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -408,7 +408,7 @@ index 9cb4e5a1e6..b290f64fa1 100644
         } else {
             return null;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 1991cee43d..bb20398abc 100644
+index 1991cee43..bb20398ab 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -223,13 +223,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -493,7 +493,7 @@ index 1991cee43d..bb20398abc 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ad474500e2..2848268979 100644
+index ad474500e..284826897 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -242,7 +242,7 @@ public abstract class EntityLiving extends Entity {
@@ -592,7 +592,7 @@ index ad474500e2..2848268979 100644
 
     private void n() {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cd8df622f0..4f0ae1bc45 100644
+index cd8df622f..4f0ae1bc4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -825,7 +825,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -625,7 +625,7 @@ index cd8df622f0..4f0ae1bc45 100644
             PlayerTeleportEvent tpEvent = new PlayerTeleportEvent(this.getBukkitEntity(), enter, exit, cause);
             Bukkit.getServer().getPluginManager().callEvent(tpEvent);
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 6e0020ae0b..a7a07ffc43 100644
+index 6e0020ae0..a7a07ffc4 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -144,9 +144,9 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -641,7 +641,7 @@ index 6e0020ae0b..a7a07ffc43 100644
             --this.bB;
             if (this.bB <= 0) {
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index a353f3d5fa..5f976a17c7 100644
+index a353f3d5f..5f976a17c 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -285,7 +285,7 @@ public class Explosion {
@@ -663,7 +663,7 @@ index a353f3d5fa..5f976a17c7 100644
             }
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 63865f767b..82aa50bf85 100644
+index 63865f767..82aa50bf8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -933,18 +933,18 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -821,7 +821,7 @@ index 63865f767b..82aa50bf85 100644
 
     public boolean getAllowNether() {
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index dc32107ec3..cd8a631d7d 100644
+index dc32107ec..cd8a631d7 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -137,14 +137,14 @@ public abstract class NavigationAbstract {
@@ -842,7 +842,7 @@ index dc32107ec3..cd8a631d7d 100644
                 this.q = pathentity.k();
                 this.r = j;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 90319909e5..c09c5440b3 100644
+index 90319909e..c09c5440b 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -77,7 +77,7 @@ public class PathfinderGoalSelector {
@@ -886,7 +886,7 @@ index 90319909e5..c09c5440b3 100644
 
     public Stream<PathfinderGoalWrapped> c() {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index c38d31fafe..e230087620 100644
+index c38d31faf..e23008762 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -537,20 +537,20 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -947,7 +947,7 @@ index c38d31fafe..e230087620 100644
                 try (co.aikar.timings.Timing ignored1 = this.world.timings.chunkSaveDataSerialization.startTiming()) { // Paper
                 nbttagcompound = ChunkRegionLoader.saveChunk(this.world, ichunkaccess);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7929fcc800..6dfbbc67dd 100644
+index 7929fcc80..6dfbbc67d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -185,7 +185,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -969,7 +969,7 @@ index 7929fcc800..6dfbbc67dd 100644
         for (int spam; (spam = this.chatThrottle) > 0 && !chatSpamField.compareAndSet(this, spam, spam - 1); ) ;
         if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - split to seperate variable
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index 3f1aa5ced6..a7f2dee2c4 100644
+index 3f1aa5ced..a7f2dee2c 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
@@ -65,7 +65,7 @@ public class TickListServer<T> implements TickList<T> {
@@ -1000,7 +1000,7 @@ index 3f1aa5ced6..a7f2dee2c4 100644
             this.h.clear();
             this.g.clear();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 839ddb14ef..11629c4ce8 100644
+index 839ddb14e..11629c4ce 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -378,9 +378,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1105,7 +1105,7 @@ index 839ddb14ef..11629c4ce8 100644
         int j = MathHelper.f((axisalignedbb.maxX + 2.0D) / 16.0D);
         int k = MathHelper.floor((axisalignedbb.minZ - 2.0D) / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a0db38b588..78fdacdaf1 100644
+index a0db38b58..78fdacdaf 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -274,12 +274,12 @@ public class WorldServer extends World {
@@ -1357,5 +1357,5 @@ index a0db38b588..78fdacdaf1 100644
 
     @Override
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0012-Asynchronous-pathfinding.patch
+++ b/patches/server/0012-Asynchronous-pathfinding.patch
@@ -1,4 +1,4 @@
-From e98f19cf20bcb5afe46e8d1ece74c79e3bf4f41a Mon Sep 17 00:00:00 2001
+From c5a951c9c8105d4a990a4fb09d7486379216297e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 13:01:13 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Asynchronous pathfinding


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index bb20398abc..cd8b462866 100644
+index bb20398ab..cd8b46286 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -686,7 +686,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -19,7 +19,7 @@ index bb20398abc..cd8b462866 100644
         // this.world.getMethodProfiler().enter("mob tick"); // Akarin - remove caller
         this.mobTick();
 diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java
-index abf450917e..4f7f40d5e7 100644
+index abf450917..4f7f40d5e 100644
 --- a/src/main/java/net/minecraft/server/Navigation.java
 +++ b/src/main/java/net/minecraft/server/Navigation.java
@@ -183,7 +183,7 @@ public class Navigation extends NavigationAbstract {
@@ -32,7 +32,7 @@ index abf450917e..4f7f40d5e7 100644
                         if (pathtype == PathType.WATER) {
                             return false;
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index cd8a631d7d..c134a96080 100644
+index cd8a631d7..c134a9608 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -29,6 +29,15 @@ public abstract class NavigationAbstract {
@@ -221,7 +221,7 @@ index cd8a631d7d..c134a96080 100644
     public boolean n() {
         return !this.m();
 diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
-index 67c63cfe33..848e2fe8b8 100644
+index 67c63cfe3..848e2fe8b 100644
 --- a/src/main/java/net/minecraft/server/Pathfinder.java
 +++ b/src/main/java/net/minecraft/server/Pathfinder.java
@@ -27,7 +27,7 @@ public class Pathfinder {
@@ -234,7 +234,7 @@ index 67c63cfe33..848e2fe8b8 100644
         this.e.a(chunkcache, entityinsentient);
         PathPoint pathpoint = this.e.b();
 diff --git a/src/main/java/net/minecraft/server/PathfinderTurtle.java b/src/main/java/net/minecraft/server/PathfinderTurtle.java
-index 59b1fe289c..1790878ae9 100644
+index 59b1fe289..1790878ae 100644
 --- a/src/main/java/net/minecraft/server/PathfinderTurtle.java
 +++ b/src/main/java/net/minecraft/server/PathfinderTurtle.java
@@ -148,7 +148,7 @@ public class PathfinderTurtle extends PathfinderNormal {
@@ -247,7 +247,7 @@ index 59b1fe289c..1790878ae9 100644
                     }
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderWater.java b/src/main/java/net/minecraft/server/PathfinderWater.java
-index 075b63ef57..a3473ddcfe 100644
+index 075b63ef5..a3473ddcf 100644
 --- a/src/main/java/net/minecraft/server/PathfinderWater.java
 +++ b/src/main/java/net/minecraft/server/PathfinderWater.java
@@ -63,7 +63,7 @@ public class PathfinderWater extends PathfinderAbstract {
@@ -260,5 +260,5 @@ index 075b63ef57..a3473ddcfe 100644
 
         if (f >= 0.0F) {
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0013-Optimizations-for-network.patch
+++ b/patches/server/0013-Optimizations-for-network.patch
@@ -1,4 +1,4 @@
-From c3da24e911229cfcf8530507d75c719ce463b3eb Mon Sep 17 00:00:00 2001
+From d91e4f6b4a10855593e1cc4ab5d7f30940b032b5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 14:59:10 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimizations for network


 diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
-index a85466bc7e..324af1a12a 100644
+index a85466bc7..324af1a12 100644
 --- a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
@@ -106,7 +106,7 @@ public final class StandardPaperServerListPingEventImpl extends PaperServerListP
@@ -19,7 +19,7 @@ index a85466bc7e..324af1a12a 100644
 
 }
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 0532f975b7..e7be1074b1 100644
+index 0532f975b..e7be1074b 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -39,7 +39,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -46,7 +46,7 @@ index 0532f975b7..e7be1074b1 100644
                 } else {
                     this.b.setPacketListener(new LoginListener(this.a, this.b));
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index f1222fcb2b..522cfed4cb 100644
+index f1222fcb2..522cfed4c 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -111,6 +111,19 @@ public class LoginListener implements PacketLoginInListener {
@@ -106,7 +106,7 @@ index f1222fcb2b..522cfed4cb 100644
 
     protected GameProfile a(GameProfile gameprofile) {
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 96a785af27..fd1d5fe3bf 100644
+index 96a785af2..fd1d5fe3b 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -43,6 +43,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -273,7 +273,7 @@ index 96a785af27..fd1d5fe3bf 100644
         if (this.t++ % 20 == 0) {
             this.s = this.s * 0.75F + (float) this.q * 0.25F;
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 8d0965a053..7e27cd280f 100644
+index 8d0965a05..7e27cd280 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
@@ -20,4 +20,10 @@ public interface Packet<T extends PacketListener> {
@@ -288,7 +288,7 @@ index 8d0965a053..7e27cd280f 100644
 +    // Akarin end
 }
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index 7eb230f1b2..d01cac0bd4 100644
+index 7eb230f1b..d01cac0bd 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
@@ -41,4 +41,11 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
@@ -304,7 +304,7 @@ index 7eb230f1b2..d01cac0bd4 100644
 +    // Akarin end
 }
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java b/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java
-index e5094f55f1..a5d9b6d94c 100644
+index e5094f55f..a5d9b6d94 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutDisconnect.java
@@ -25,4 +25,11 @@ public class PacketLoginOutDisconnect implements Packet<PacketLoginOutListener>
@@ -320,7 +320,7 @@ index e5094f55f1..a5d9b6d94c 100644
 +    // Akarin end
 }
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java b/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java
-index b0d6342c31..eeabb54c44 100644
+index b0d6342c3..eeabb54c4 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutEncryptionBegin.java
@@ -34,4 +34,11 @@ public class PacketLoginOutEncryptionBegin implements Packet<PacketLoginOutListe
@@ -336,7 +336,7 @@ index b0d6342c31..eeabb54c44 100644
 +    // Akarin end
 }
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java b/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java
-index fa0653a7e4..d3b5f83d56 100644
+index fa0653a7e..d3b5f83d5 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutSetCompression.java
@@ -25,4 +25,11 @@ public class PacketLoginOutSetCompression implements Packet<PacketLoginOutListen
@@ -352,7 +352,7 @@ index fa0653a7e4..d3b5f83d56 100644
 +    // Akarin end
 }
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java b/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java
-index 54c2904718..75d7bc1968 100644
+index 54c290471..75d7bc196 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutSuccess.java
@@ -34,4 +34,11 @@ public class PacketLoginOutSuccess implements Packet<PacketLoginOutListener> {
@@ -368,7 +368,7 @@ index 54c2904718..75d7bc1968 100644
 +    // Akarin end
 }
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 4bb21c48bd..06af567fc1 100644
+index 4bb21c48b..06af567fc 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
@@ -143,7 +143,7 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -381,7 +381,7 @@ index 4bb21c48bd..06af567fc1 100644
     }
 }
 diff --git a/src/main/java/net/minecraft/server/PacketStatusOutPong.java b/src/main/java/net/minecraft/server/PacketStatusOutPong.java
-index 94a0da87db..577c6ef9cf 100644
+index 94a0da87d..577c6ef9c 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusOutPong.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusOutPong.java
@@ -25,4 +25,11 @@ public class PacketStatusOutPong implements Packet<PacketStatusOutListener> {
@@ -397,7 +397,7 @@ index 94a0da87db..577c6ef9cf 100644
 +    // Akarin end
 }
 diff --git a/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java b/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java
-index 50d5fb62ef..4da7a2c1a4 100644
+index 50d5fb62e..4da7a2c1a 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusOutServerInfo.java
@@ -28,4 +28,11 @@ public class PacketStatusOutServerInfo implements Packet<PacketStatusOutListener
@@ -413,7 +413,7 @@ index 50d5fb62ef..4da7a2c1a4 100644
 +    // Akarin end
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6dfbbc67dd..b23612817b 100644
+index 6dfbbc67d..b23612817 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -284,9 +284,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -429,7 +429,7 @@ index 6dfbbc67dd..b23612817b 100644
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6d6fbf2f50..fa23e838ee 100644
+index 6d6fbf2f5..fa23e838e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -159,6 +159,8 @@ public abstract class PlayerList {
@@ -460,5 +460,5 @@ index 6d6fbf2f50..fa23e838ee 100644
         entityplayer.getStatisticManager().c();
         entityplayer.B().a(entityplayer);
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0014-Swaps-the-predicate-order-of-collision.patch
+++ b/patches/server/0014-Swaps-the-predicate-order-of-collision.patch
@@ -1,4 +1,4 @@
-From e56c754100a66019abddd4b67521788e934ba89e Mon Sep 17 00:00:00 2001
+From a1371db468eb761da0c82eb43ccc3d8235f7a1bb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 10 Apr 2020 15:47:15 +0800
@@ -6,7 +6,7 @@ Subject: [PATCH] Swaps the predicate order of collision


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b290f64fa1..fb21da032a 100644
+index b290f64fa..fb21da032 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1403,8 +1403,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -21,5 +21,5 @@ index b290f64fa1..fb21da032a 100644
                 double d1 = entity.locZ() - this.locZ();
                 double d2 = MathHelper.a(d0, d1);
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch
+++ b/patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch
@@ -1,4 +1,4 @@
-From 310f33996722b048faa9bf70c4beaca783de989b Mon Sep 17 00:00:00 2001
+From f79355679035b382e7d6ba970e77102160d02939 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 02:39:12 +0700
 Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in
@@ -6,7 +6,7 @@ Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in


 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 0244768f76..13d113aee5 100644
+index 0244768f7..13d113aee 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
@@ -33,7 +33,7 @@ public abstract class ChunkMapDistance {
@@ -19,5 +19,5 @@ index 0244768f76..13d113aee5 100644
     private final Mailbox<ChunkTaskQueueSorter.a<Runnable>> j;
     private final Mailbox<ChunkTaskQueueSorter.b> k;
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch
+++ b/patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch
@@ -1,4 +1,4 @@
-From 448d83678ae21c978b2d7cd0294e8f412c317170 Mon Sep 17 00:00:00 2001
+From d11cfc8c845748f4a3ffbdd4c102a1b350f532cc Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 02:44:07 +0700
 Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf
@@ -6,7 +6,7 @@ Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf
 Remove iterator allocation and ensure the call is always O(n)

 diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java
-index 85f799a713..f23ddb9e0c 100644
+index 85f799a71..f23ddb9e0 100644
 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java
 +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java
@@ -11,7 +11,9 @@ public class ArraySetSorted<T> extends AbstractSet<T> {
@@ -63,5 +63,5 @@ index 85f799a713..f23ddb9e0c 100644
         return new ArraySetSorted<>(i, (Comparator)Comparator.naturalOrder()); // Paper - decompile fix
     }
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 58097b8b6c20d860e27b7a159fceb52de55462aa Mon Sep 17 00:00:00 2001
+From 8bb733f7e5a75ca89b0fdf2dda187b923ca07432 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 02:49:56 +0700
 Subject: [PATCH] Don't run entity collision code if not needed
@@ -9,7 +9,7 @@ the max collisions per entity is less than or equal to 0
 This commit was basically referenced on Tuinity#7131da4.

 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2848268979..c1c7e7dca3 100644
+index 284826897..c1c7e7dca 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2663,10 +2663,16 @@ public abstract class EntityLiving extends Entity {
@@ -31,5 +31,5 @@ index 2848268979..c1c7e7dca3 100644
 
             if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) {
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0018-Optimize-door-interact-with-pathfinding.patch
+++ b/patches/server/0018-Optimize-door-interact-with-pathfinding.patch
@@ -1,4 +1,4 @@
-From ae21af5043b9d3664b1ad091d40268c007a963da Mon Sep 17 00:00:00 2001
+From b3d09522e40d1fda731e4c6c55f70fbd405aab06 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 03:51:50 +0700
 Subject: [PATCH] Optimize door interact with pathfinding
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize door interact with pathfinding

 diff --git a/src/main/java/io/akarin/server/IndexedBlockPosition.java b/src/main/java/io/akarin/server/IndexedBlockPosition.java
 new file mode 100644
-index 0000000000..83bf1d4cab
+index 000000000..83bf1d4ca
 --- /dev/null
 +++ b/src/main/java/io/akarin/server/IndexedBlockPosition.java
@@ -0,0 +1,35 @@
@@ -46,7 +46,7 @@ index 0000000000..83bf1d4cab
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BehaviorInteractDoor.java b/src/main/java/net/minecraft/server/BehaviorInteractDoor.java
-index 01d9c2d92c..3db22c5f4d 100644
+index 01d9c2d92..3db22c5f4 100644
 --- a/src/main/java/net/minecraft/server/BehaviorInteractDoor.java
 +++ b/src/main/java/net/minecraft/server/BehaviorInteractDoor.java
@@ -1,7 +1,9 @@
@@ -147,7 +147,7 @@ index 01d9c2d92c..3db22c5f4d 100644
                 if (worldserver.getWorldProvider().getDimensionManager() != globalpos.getDimensionManager()) {
                     iterator.remove();
 diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java
-index dfe0f66500..46eb633084 100644
+index dfe0f6650..46eb63308 100644
 --- a/src/main/java/net/minecraft/server/BehaviorSleep.java
 +++ b/src/main/java/net/minecraft/server/BehaviorSleep.java
@@ -57,7 +57,7 @@ public class BehaviorSleep extends Behavior<EntityLiving> {
@@ -160,5 +160,5 @@ index dfe0f66500..46eb633084 100644
             entityliving.entitySleep(((GlobalPos) entityliving.getBehaviorController().getMemory(MemoryModuleType.HOME).get()).getBlockPosition());
         }
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0019-Remove-stream-for-ender-teleport.patch
+++ b/patches/server/0019-Remove-stream-for-ender-teleport.patch
@@ -1,11 +1,11 @@
-From 7e98197e956e3201e2505815a653cbd77fa844b8 Mon Sep 17 00:00:00 2001
+From de67219af39f3c7cbf541a6dcb46f4fce1fdaa49 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 04:16:44 +0700
 Subject: [PATCH] Remove stream for ender teleport


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fb21da032a..6b43c41a85 100644
+index fb21da032..6b43c41a8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2842,7 +2842,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -33,5 +33,5 @@ index fb21da032a..6b43c41a85 100644
     public boolean hasSinglePlayerPassenger() {
         Set<Entity> set = Sets.newHashSet();
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0020-Cache-hashcode-for-BlockPosition.patch
+++ b/patches/server/0020-Cache-hashcode-for-BlockPosition.patch
@@ -1,11 +1,11 @@
-From 086e6eb2ed02d55f55aa49404fe1b58ef92ec0d7 Mon Sep 17 00:00:00 2001
+From 853c375c1977fca6c0a4e87e4c3de748ed720658 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 04:28:25 +0700
 Subject: [PATCH] Cache hashcode for BlockPosition


 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index c439a8d019..808f2eb6cb 100644
+index c439a8d01..cc1856043 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
@@ -18,6 +18,7 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -16,28 +16,30 @@ index c439a8d019..808f2eb6cb 100644
 
     public BaseBlockPosition(int i, int j, int k) {
         this.x = i;
-@@ -42,8 +43,18 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
+@@ -42,8 +43,20 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
     }
 
     public int hashCode() {
 -        return (this.getY() + this.getZ() * 31) * 31 + this.getX();
 +        // Akarin start - cache hashcode
-+        if (hash == 0) {
-+          hash = (this.getY() + this.getZ() * 31) * 31 + this.getX();
+        int result = hash; // Make the situation not too bad when it is modified by multiple threads
+        if (result == 0) {
+          result = (this.getY() + this.getZ() * 31) * 31 + this.getX();
+          hash = result;
 +        }
-+        return hash;
+        return result;
 +        // return (this.getY() + this.getZ() * 31) * 31 + this.getX();
 +    }
 +
 +    public void recalcHashCode() {
-+      hash = (this.getY() + this.getZ() * 31) * 31 + this.getX();
+      hash = 0;
     }
 +    // Akarin end
 
     public int compareTo(BaseBlockPosition baseblockposition) {
         return this.getY() == baseblockposition.getY() ? (this.getZ() == baseblockposition.getZ() ? this.getX() - baseblockposition.getX() : this.getZ() - baseblockposition.getZ()) : this.getY() - baseblockposition.getY();
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 2d07d350d2..43e7e5c27b 100644
+index 2d07d350d..43e7e5c27 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -439,6 +439,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -69,5 +71,5 @@ index 2d07d350d2..43e7e5c27b 100644
 
         @Override
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch
+++ b/patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch
@@ -1,11 +1,11 @@
-From 7b07c24aa3a90facbd8a0a31ed414d9ea442a32b Mon Sep 17 00:00:00 2001
+From f2d1556bf8e5f431debcc65ab9f0065caea2d284 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 17:49:07 +0700
 Subject: [PATCH] Remove stream and simplify operation in pathfinder


 diff --git a/src/main/java/net/minecraft/server/PathDestination.java b/src/main/java/net/minecraft/server/PathDestination.java
-index 9071d43d8b..2f33aafe34 100644
+index 9071d43d8..2f33aafe3 100644
 --- a/src/main/java/net/minecraft/server/PathDestination.java
 +++ b/src/main/java/net/minecraft/server/PathDestination.java
@@ -5,6 +5,7 @@ public class PathDestination extends PathPoint {
@@ -17,7 +17,7 @@ index 9071d43d8b..2f33aafe34 100644
     public PathDestination(PathPoint pathpoint) {
         super(pathpoint.a, pathpoint.b, pathpoint.c);
 diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
-index 848e2fe8b8..379ee96b08 100644
+index 848e2fe8b..379ee96b0 100644
 --- a/src/main/java/net/minecraft/server/Pathfinder.java
 +++ b/src/main/java/net/minecraft/server/Pathfinder.java
@@ -2,7 +2,9 @@ package net.minecraft.server;
@@ -150,5 +150,5 @@ index 848e2fe8b8..379ee96b08 100644
         List<PathPoint> list = Lists.newArrayList();
         PathPoint pathpoint1 = pathpoint;
 -- 
-2.25.1.windows.1
+2.20.1

--- a/patches/server/0022-Remove-a-few-more-streams.patch
+++ b/patches/server/0022-Remove-a-few-more-streams.patch
@@ -1,11 +1,11 @@
-From c9cdd49decdb2cf080feaef08f76a0dbbd2d72bf Mon Sep 17 00:00:00 2001
+From b95f268f3afd58685ccb76b4800b81eb36030eac Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 22:45:48 +0700
 Subject: [PATCH] Remove a few more streams


 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 13d113aee5..1890fad9ed 100644
+index 13d113aee..1890fad9e 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
@@ -108,9 +108,15 @@ public abstract class ChunkMapDistance {
@@ -48,7 +48,7 @@ index 13d113aee5..1890fad9ed 100644
 
                 this.l.clear();
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 9c31edade2..eb3f45d8b7 100644
+index 9c31edade..eb3f45d8b 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -92,12 +92,23 @@ public class EntityTNTPrimed extends Entity {
@@ -76,7 +76,7 @@ index 9c31edade2..eb3f45d8b7 100644
         }
         // Paper end
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index a7a07ffc43..c9f0f7787f 100644
+index a7a07ffc4..c9f0f7787 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -548,11 +548,20 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -101,5 +101,5 @@ index a7a07ffc43..c9f0f7787f 100644
         }
     }
 -- 
-2.25.1.windows.1
+2.20.1