Fixup missing modification

patches/api/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 0f1e037ddc71266d18a78ef599658254407c3dd9 Mon Sep 17 00:00:00 2001
+From 6fdab507792e9ac082dd7457892281f6eb4e9965 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

patches/api/0002-Add-server-configuration.patch

@@ -1,4 +1,4 @@
-From 44b9b1dd369d2b505c83336d6537b779fd9cfec8 Mon Sep 17 00:00:00 2001
+From 338a5004ab830b533e2d2fd19012e312ae6812c4 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

patches/server/0001-Fix-errors-on-eclipse.patch

@@ -1,4 +1,4 @@
-From e60b30372fd2b79601e8dd18b5e36ec7d608caa6 Mon Sep 17 00:00:00 2001
+From 77578fc0cd72835f1556313fd221975e393d0b21 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 eclipse

patches/server/0002-POM-Changes.patch

@@ -1,4 +1,4 @@
-From c5290cf9e102048ab6befd461c5ad4fb6a207a69 Mon Sep 17 00:00:00 2001
+From c3757a0b1aecc6357f67340454fcfef19b7452ad 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

patches/server/0003-Brand-changes.patch

@@ -1,4 +1,4 @@
-From 178a508e5e92c3562aaaa3e0dbfeecb6405acbda Mon Sep 17 00:00:00 2001
+From f81de8b443e6731fda1260619087595fbe352014 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

patches/server/0004-Avoid-double-I-O-operation-on-load-player-file.patch

@@ -1,4 +1,4 @@
-From 4fdac6d235064f8d515fdccc14f829931e7ab959 Mon Sep 17 00:00:00 2001
+From 5b765acc7e6819d97ca292b14852d421cefa9d87 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

patches/server/0005-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch

@@ -1,4 +1,4 @@
-From 65fe2ee4002ec257d9efbff8db1218c6e183d251 Mon Sep 17 00:00:00 2001
+From 0690a04bb879160b0156e3e78dbe0adad4b49411 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

patches/server/0006-Never-drop-items-on-command-give.patch

@@ -1,4 +1,4 @@
-From 0e436814a06d9dadf90fa53bc017ac98adde4632 Mon Sep 17 00:00:00 2001
+From fe67812ce5fad9493ec941ce50d00fae2a9190f2 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

patches/server/0007-Save-json-list-async.patch

@@ -1,4 +1,4 @@
-From bcc260c3234d1b19a631752753ad02b59397a01d Mon Sep 17 00:00:00 2001
+From 705f02ed90347293e72adb8938a13d40216a7c1e 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

patches/server/0008-Remove-method-profiler-callers.patch

@@ -1,4 +1,4 @@
-From c94d0908daa1841e7dce31350a743858183d658c Mon Sep 17 00:00:00 2001
+From 35e92c1df1d901885f697ad4f6eaed94b33ca3c3 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 12:30:35 +0800

patches/server/0009-Disable-Snooper.patch

@@ -1,4 +1,4 @@
-From f7e6383d04e10e96b6bc79ac294521492a1ec250 Mon Sep 17 00:00:00 2001
+From 4253abd52b52b73db96228c487016a4c8c2ca38c 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 14:03:29 +0800

patches/server/0010-Server-Config.patch

@@ -1,4 +1,4 @@
-From d6a82ab04ab9531194fad151a08069e893c958ab Mon Sep 17 00:00:00 2001
+From 4d8cdc79a38c9d8b55b5a4f0f18895869b8babc3 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

patches/server/0011-Async-pathfinder.patch

@@ -1,4 +1,4 @@
-From d248632e777b854bcb65fd6f1c3094e6287a08ee Mon Sep 17 00:00:00 2001
+From d917bb33e2dd73efbedc3eb04e8f4a399acd29bd 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
@@ -263,7 +263,7 @@ index dcb4e25080..265b6df4f6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
-index 67c63cfe33..00bd2327f2 100644
+index 67c63cfe33..b656adc788 100644
 --- a/src/main/java/net/minecraft/server/Pathfinder.java
 +++ b/src/main/java/net/minecraft/server/Pathfinder.java
 @@ -15,9 +15,9 @@ import javax.annotation.Nullable;
@@ -286,19 +286,11 @@ index 67c63cfe33..00bd2327f2 100644
 +    public PathEntity findPaths(ChunkCache chunkcache, EntityInsentient entityinsentient, Set<BlockPosition> set, float f, int i, float f1) { return a(chunkcache, entityinsentient, set, f, i, f1); } // Akarin - OBFHELPER
      @Nullable
 -    public PathEntity a(ChunkCache chunkcache, EntityInsentient entityinsentient, Set<BlockPosition> set, float f, int i, float f1) {
-+    public synchronized PathEntity a(ChunkCache chunkcache, EntityInsentient entityinsentient, Set<BlockPosition> set, float f, int i, float f1) {
++    public synchronized PathEntity a(ChunkCache chunkcache, EntityInsentient entityinsentient, Set<BlockPosition> set, float f, int i, float f1) { // Akarin - synchronized
          this.a.a();
          this.e.a(chunkcache, entityinsentient);
          PathPoint pathpoint = this.e.b();
-@@ -40,6 +41,7 @@ public class Pathfinder {
+@@ -117,6 +118,7 @@ public class Pathfinder {
-         return pathentity;
-     }
- 
-+    private PathEntity findPaths0(PathPoint pathpoint, Map<PathDestination, BlockPosition> map, float f, int i, float f1) { return a(pathpoint, map, f, i, f1); } // Akarin - OBFHELPER
-     @Nullable
-     private PathEntity a(PathPoint pathpoint, Map<PathDestination, BlockPosition> map, float f, int i, float f1) {
-         Set<PathDestination> set = map.keySet();
-@@ -117,6 +119,7 @@ public class Pathfinder {
          }
      }
  
@@ -306,7 +298,7 @@ index 67c63cfe33..00bd2327f2 100644
      private float a(PathPoint pathpoint, Set<PathDestination> set) {
          float f = Float.MAX_VALUE;
  
-@@ -132,6 +135,7 @@ public class Pathfinder {
+@@ -132,6 +134,7 @@ public class Pathfinder {
          return f;
      }
  

patches/server/0012-Optimizations-for-network.patch

@@ -1,4 +1,4 @@
-From d684fdf99760e63673130bea2ad607d2b5293af8 Mon Sep 17 00:00:00 2001
+From 6f49babb1764534a6bc31a1639c1906f78c07601 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

patches/server/0013-Swaps-the-predicate-order-of-collision.patch

@@ -1,4 +1,4 @@
-From 0813729083aa4a9428d942948949aceb6a7c6f14 Mon Sep 17 00:00:00 2001
+From 87d093899bc100e2de9807de4c47645ffab4abab 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

patches/server/0014-Akarin-Metrics.patch

@@ -1,4 +1,4 @@
-From 519ffa752cbbc7d21d51e138408b5709088efa09 Mon Sep 17 00:00:00 2001
+From 0c8b107fe43d652ef656bf1e7bcd4d13ef069cbc 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

patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch

@@ -1,4 +1,4 @@
-From 2aee08384e8e66b46549aad18f1f0a5d3c8cb907 Mon Sep 17 00:00:00 2001
+From 74e7893944513b472e5161b8d2728ece330537b6 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

patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch

@@ -1,4 +1,4 @@
-From dc576ed9118409b58d8a1fdb73b36ddc717d9549 Mon Sep 17 00:00:00 2001
+From e0f91f8296e3fb8b4b6b5a6b44574171ab87251c 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

patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch

@@ -1,4 +1,4 @@
-From 7a0d54b371124fb3ebde16772a8ffa64ae6518e4 Mon Sep 17 00:00:00 2001
+From 69300a612aad3329f78e3e3f5b425b1dd24336b8 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

patches/server/0018-Optimize-door-interact-pathfinding.patch

@@ -1,4 +1,4 @@
-From 4a1b791e1a4960a90fa5a44318de4c08489245c8 Mon Sep 17 00:00:00 2001
+From ce2095723644ba66f5b7ed5a555a381b9a1f1443 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 pathfinding

patches/server/0019-Remove-stream-for-ender-teleport.patch

@@ -1,4 +1,4 @@
-From d35e42710ea9d7b74e606995f955fca9605cc750 Mon Sep 17 00:00:00 2001
+From b8f6fa04fb7b2d426d217c3b0ddf84f6b88835a4 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

patches/server/0020-Cache-Hashcode-for-BlockPosition.patch

@@ -1,4 +1,4 @@
-From b6acf84069f78250453e7f0f609a1ce5021fe9d8 Mon Sep 17 00:00:00 2001
+From 93e8fd577e63a60e694c018cbbc93aa71ea544b9 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

patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch

@@ -1,11 +1,23 @@
-From 2cb5743ec13a1dae4f1c9546497b045428bea23b Mon Sep 17 00:00:00 2001
+From 7ad553948084e3dd0916bc1f498703279d82d571 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 op in pathfinder
+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
+--- 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 {
+     private float m = Float.MAX_VALUE;
+     private PathPoint n;
+     private boolean o;
++    protected BlockPosition position; // Akarin - add BlockPosition
+ 
+     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 00bd2327f2..e645ee7422 100644
+index b656adc788..1ff169c345 100644
 --- a/src/main/java/net/minecraft/server/Pathfinder.java
 +++ b/src/main/java/net/minecraft/server/Pathfinder.java
 @@ -32,9 +32,20 @@ public class Pathfinder {
@@ -30,9 +42,9 @@ index 00bd2327f2..e645ee7422 100644
          PathEntity pathentity = this.a(pathpoint, map, f, i, f1);
  
          this.e.a();
-@@ -43,8 +54,8 @@ public class Pathfinder {
+@@ -42,8 +53,8 @@ public class Pathfinder {
+     }
  
-     private PathEntity findPaths0(PathPoint pathpoint, Map<PathDestination, BlockPosition> map, float f, int i, float f1) { return a(pathpoint, map, f, i, f1); } // Akarin - OBFHELPER
      @Nullable
 -    private PathEntity a(PathPoint pathpoint, Map<PathDestination, BlockPosition> map, float f, int i, float f1) {
 -        Set<PathDestination> set = map.keySet();
@@ -41,7 +53,7 @@ index 00bd2327f2..e645ee7422 100644
  
          pathpoint.e = 0.0F;
          pathpoint.f = this.a(pathpoint, set);
-@@ -100,11 +111,11 @@ public class Pathfinder {
+@@ -99,11 +110,11 @@ public class Pathfinder {
  
          if (set.stream().anyMatch(PathDestination::f)) {
              stream = set.stream().filter(PathDestination::f).map((pathdestination) -> {