Update upstream

2020-07-17 18:05:50 +02:00 · 2020-07-17 18:05:50 +02:00 · 1595b34353
parent 1d7115db60
commit 1595b34353
35 changed files with 106 additions and 349 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,4 +8,4 @@ mc-dev
 .idea
 yapfa-paperclip.jar

-target/site/surefire-report.html
+target
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 74a062e04c76d21296f7e6d176261c51503ce4b0
+Subproject commit 3950d4b720874c0bb282d986749a3e3cf9ceed1b
--- a/patches/api/0001-Modify-POM.patch
+++ b/patches/api/0001-Modify-POM.patch
@ -1,14 +1,11 @@
-From 8fb20c925ac9da854016fa50004c8c946c7fe54e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 17:03:06 +0100
 Subject: [PATCH] Modify POM

---
- pom.xml | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)

 diff --git a/pom.xml b/pom.xml
-index 85573acf8..1328fe869 100644
+index a957d8a643805989b759bcc1f9eb2701032d2e35..853f1fe45804cb69f3af9cd58ccc65ea242fe4f9 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -3,18 +3,18 @@
@ -35,6 +32,3 @@ index 85573acf8..1328fe869 100644
     <description>An enhanced plugin API for Minecraft servers.</description>
 
     <properties>
-- 
-2.25.1.windows.1
-
--- a/patches/api/0002-Kill-AnnotationTest.patch
+++ b/patches/api/0002-Kill-AnnotationTest.patch
@ -1,16 +1,12 @@
-From d3a4fd51f8bdd2da33da8db08ce0bba90bbe9eae Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 20:10:31 +0100
 Subject: [PATCH] Kill AnnotationTest

---
- src/test/java/org/bukkit/AnnotationTest.java | 259 -------------------
- 1 file changed, 259 deletions(-)
- delete mode 100644 src/test/java/org/bukkit/AnnotationTest.java

 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
 deleted file mode 100644
-index a48be38b1..000000000
+index a48be38b159bec27ec398666b28620a9ea625547..0000000000000000000000000000000000000000
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ /dev/null
@@ -1,259 +0,0 @@
@ -273,6 +269,3 @@ index a48be38b1..000000000
 -        out.add(clazz.name + " \t" + method.name + " \t" + description);
 -    }
 -}
-- 
-2.25.1.windows.1
-
--- a/patches/api/0003-Add-GameProfileLookupEvent.patch
+++ b/patches/api/0003-Add-GameProfileLookupEvent.patch
@ -1,16 +1,11 @@
-From e6764aeb9184e2b0b67261d7f5bad3b22c4cfb42 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 22:21:14 +0100
 Subject: [PATCH] Add GameProfileLookupEvent

---
- pom.xml                                       | 11 +++++
- .../yapfa/events/GameProfileLookupEvent.java  | 45 +++++++++++++++++++
- 2 files changed, 56 insertions(+)
- create mode 100644 src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java

 diff --git a/pom.xml b/pom.xml
-index 1328fe869..1394dbd8f 100644
+index 853f1fe45804cb69f3af9cd58ccc65ea242fe4f9..d6065069db2d44e9e779e3d9f6a69fa37aeaeebd 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -39,6 +39,10 @@
@ -40,7 +35,7 @@ index 1328fe869..1394dbd8f 100644
             <artifactId>fastutil</artifactId>
 diff --git a/src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java b/src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java
 new file mode 100644
-index 000000000..4ab5fd191
+index 0000000000000000000000000000000000000000..4ab5fd191b74bcce59ea700f6bcc7b1bab65f13e
 --- /dev/null
 +++ b/src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java
@@ -0,0 +1,45 @@
@ -89,6 +84,3 @@ index 000000000..4ab5fd191
 +        return handlers;
 +    }
 +}
-- 
-2.25.1.windows.1
-
--- a/patches/api/0004-Add-getLastTickMs-api.patch
+++ b/patches/api/0004-Add-getLastTickMs-api.patch
@ -1,15 +1,11 @@
-From 188ed83ffbb91220af2a6759a44c731d6a02a897 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 21:13:14 +0100
 Subject: [PATCH] Add getLastTickMs() api

---
- src/main/java/org/bukkit/Bukkit.java |  8 ++++++++
- src/main/java/org/bukkit/Server.java | 11 +++++++++++
- 2 files changed, 19 insertions(+)

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4e92ce182..db5be7074 100644
+index 4e92ce18227c8f650fe5c6f4a670e6f56d629872..db5be70744097fb07fb5a8d494120f050bef0a4d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1760,6 +1760,14 @@ public final class Bukkit {
@ -28,7 +24,7 @@ index 4e92ce182..db5be7074 100644
     @NotNull
     public static Server.Spigot spigot() {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 65a40c4a9..ce69ad962 100644
+index 65a40c4a9b24fa607d284e203becba034520b75d..ce69ad962989fe00b3166082a61d507058639525 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -1546,4 +1546,15 @@ public interface Server extends PluginMessageRecipient {
@ -47,6 +43,3 @@ index 65a40c4a9..ce69ad962 100644
 +    
 +    // YAPFA end
 }
-- 
-2.25.1.windows.1
-
--- a/patches/api/0005-Add-NBT-API-as-first-class-lib.patch
+++ b/patches/api/0005-Add-NBT-API-as-first-class-lib.patch
@ -1,17 +1,11 @@
-From 3b055a7542be0eee942116338de2ff29bbe969c4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 2 Apr 2020 18:49:56 +0200
 Subject: [PATCH] Add NBT-API as first-class lib

---
- pom.xml                                       | 16 +++++++++++++++
- src/main/java/org/bukkit/block/TileState.java | 10 ++++++++++
- src/main/java/org/bukkit/entity/Entity.java   | 10 ++++++++++
- .../java/org/bukkit/inventory/ItemStack.java  | 20 +++++++++++++++++++
- 4 files changed, 56 insertions(+)

 diff --git a/pom.xml b/pom.xml
-index fbfa66ea1..808fca9b0 100644
+index d6065069db2d44e9e779e3d9f6a69fa37aeaeebd..875e46318a774bacf7b156d1ca51b95c9e1c40ab 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -43,6 +43,11 @@
@ -52,7 +46,7 @@ index fbfa66ea1..808fca9b0 100644
             </plugin>
             <plugin>
 diff --git a/src/main/java/org/bukkit/block/TileState.java b/src/main/java/org/bukkit/block/TileState.java
-index 3b10fcc13..acb135968 100644
+index 3b10fcc13893403b29f0260b8605144679e89b82..acb13596874191f9356a25befa49af73dab3dc58 100644
 --- a/src/main/java/org/bukkit/block/TileState.java
 +++ b/src/main/java/org/bukkit/block/TileState.java
@@ -4,6 +4,8 @@ import org.bukkit.persistence.PersistentDataContainer;
@ -78,7 +72,7 @@ index 3b10fcc13..acb135968 100644
 +    // YAPFA end
 }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 7808ade92..a8cf16da1 100644
+index 7808ade92ccd3553056c57cdf77464fb8bdf9312..a8cf16da197383202859245d04ff92a8d455a6fb 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -23,6 +23,8 @@ import org.jetbrains.annotations.Contract;
@ -104,7 +98,7 @@ index 7808ade92..a8cf16da1 100644
 +    // YAPFA end
 }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ccd81fca2..433d29ba0 100644
+index ccd81fca25233c2a9c2a8c3f4dda3053d7b2e723..433d29ba0efd9782f556266fed33492c195c13c2 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -1,6 +1,10 @@
@ -139,6 +133,3 @@ index ccd81fca2..433d29ba0 100644
 +    
 +    // YAPFA end
 }
-- 
-2.25.1.windows.1
-
--- a/patches/api/0006-EMC-Add-ChatColor.getById.patch
+++ b/patches/api/0006-EMC-Add-ChatColor.getById.patch
@ -1,15 +1,12 @@
-From b9aa28e48ad85980e0004b20d6ff412e54abd34c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 24 Apr 2017 20:27:23 -0400
 Subject: [PATCH] EMC Add ChatColor.getById

 Bukkit has had a map of this for years and it was totally unused...
---
- src/main/java/org/bukkit/ChatColor.java | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)

 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 44d597d7a..3461c5a86 100644
+index 44d597d7a6f66a18b8037e971170ff7cea5e825f..3461c5a860f571d7cd2ecace4b56c37cbcc85d37 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
@@ -263,6 +263,15 @@ public enum ChatColor {
@ -46,6 +43,3 @@ index 44d597d7a..3461c5a86 100644
     /**
      * Gets the color represented by the specified color code
      *
-- 
-2.25.1.windows.1
-
--- a/patches/server/0001-Modify-POM.patch
+++ b/patches/server/0001-Modify-POM.patch
@ -1,14 +1,11 @@
-From 1e20ec51a2dce9db2861b7664fdeb316c38bc9e7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 17:08:07 +0100
 Subject: [PATCH] Modify POM

---
- pom.xml | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)

 diff --git a/pom.xml b/pom.xml
-index aa8e5052a..8351a3d3d 100644
+index 6fd59681784a5cc369f4903b4da0d11174b805f2..df21e0a9396f99b62be433246ecf098dd8ac24f4 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -1,11 +1,11 @@
@ -77,6 +74,3 @@ index aa8e5052a..8351a3d3d 100644
                     <scmDirectory>..</scmDirectory>
                 </configuration>
                 <executions>
-- 
-2.25.1.windows.1
-
--- a/patches/server/0002-Brandings.patch
+++ b/patches/server/0002-Brandings.patch
@ -1,20 +1,11 @@
-From 61f96970034aa6ba01b9fbc70ad9651cf0fe0fdd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 18:37:34 +0100
 Subject: [PATCH] Brandings

---
- .../paper/console/PaperConsole.java           |  1 +
- .../de/tr7zw/yapfa/YapfaVersionFetcher.java   | 20 +++++++++++++++++++
- .../net/minecraft/server/MinecraftServer.java |  2 +-
- .../org/bukkit/craftbukkit/CraftServer.java   |  2 +-
- .../craftbukkit/util/CraftMagicNumbers.java   |  2 +-
- .../bukkit/craftbukkit/util/Versioning.java   |  2 +-
- 6 files changed, 25 insertions(+), 4 deletions(-)
- create mode 100644 src/main/java/de/tr7zw/yapfa/YapfaVersionFetcher.java

 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index 74ed02fa92..1a9eda0d8b 100644
+index 74ed02fa9296583977bb721014b10ff8b708b43c..1a9eda0d8bec1d10b3c349a3e62a077b9bab94c7 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -18,6 +18,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@ -27,7 +18,7 @@ index 74ed02fa92..1a9eda0d8b 100644
         );
 diff --git a/src/main/java/de/tr7zw/yapfa/YapfaVersionFetcher.java b/src/main/java/de/tr7zw/yapfa/YapfaVersionFetcher.java
 new file mode 100644
-index 0000000000..b7a73408ea
+index 0000000000000000000000000000000000000000..b7a73408ea6a1e66aa97a0d924d26fac307fe673
 --- /dev/null
 +++ b/src/main/java/de/tr7zw/yapfa/YapfaVersionFetcher.java
@@ -0,0 +1,20 @@
@ -53,7 +44,7 @@ index 0000000000..b7a73408ea
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index eb71fa6e39..6949761d8b 100644
+index eb71fa6e39ecf477f18a2ae5a159d8b62ad4bfb5..6949761d8b1b07f49accb47d78840fd801a83b88 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1504,7 +1504,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -66,7 +57,7 @@ index eb71fa6e39..6949761d8b 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 2d042e0581..d33b57a5c7 100644
+index ba42171096b1d0be518c43f6eacc85ead935a941..c29002ac45f007db9eb4d0609b9b4b97a8dc199a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
@ -79,7 +70,7 @@ index 2d042e0581..d33b57a5c7 100644
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index f1e60981ab..936d97530f 100644
+index f1e60981abc46807f8004f0ac49127a2bb83fc42..936d97530f546c9467fbf6b3dcde3df270e2422e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -323,7 +323,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@ -92,7 +83,7 @@ index f1e60981ab..936d97530f 100644
 
     @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 001b1e5197..e3c4ad3d35 100644
+index 001b1e5197eaa51bfff9031aa6c69876c9a47960..e3c4ad3d35f339aced96562b9b6d64cf74f53ee0 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 {
@ -104,6 +95,3 @@ index 001b1e5197..e3c4ad3d35 100644
         Properties properties = new Properties();
 
         if (stream != null) {
-- 
-2.25.1.windows.1
-
--- a/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch
+++ b/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch
@ -1,14 +1,11 @@
-From d5134ce97ec215e2f08ac8c9208b1162773c53ff Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 21:39:58 +0100
 Subject: [PATCH] Don't save Fireworks and Arrows

---
- src/main/java/net/minecraft/server/Entity.java | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3db19a9bab..9430cda805 100644
+index 3db19a9bab8ffdc42f280a27c867bf7d1a1ab9e7..9430cda80517b736aa07b8e57a1ae0f9f895f32d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1714,7 +1714,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -21,6 +18,3 @@ index 3db19a9bab..9430cda805 100644
 
         if (this.persist && !this.dead && s != null) { // CraftBukkit - persist flag
             nbttagcompound.setString("id", s);
-- 
-2.25.1.windows.1
-
--- a/patches/server/0004-Add-GameProfileLookupEvent.patch
+++ b/patches/server/0004-Add-GameProfileLookupEvent.patch
@ -1,15 +1,11 @@
-From 4f0a395b13722946811e1453770f69bf6d70641e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 22:22:02 +0100
 Subject: [PATCH] Add GameProfileLookupEvent

---
- .../paper/profile/CraftPlayerProfile.java     | 26 ++++++++++++++-----
- .../net/minecraft/server/TileEntitySkull.java | 15 ++++++++++-
- 2 files changed, 33 insertions(+), 8 deletions(-)

 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
-index d73de9eb8..8b9c017bd 100644
+index 293b73f4747f48dbf8b6a8453d3fc777de11588d..d79472569d5d8fea2bf7faee2b7d8a6c2a6b17cc 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
@@ -5,9 +5,13 @@ import com.google.common.base.Charsets;
@ -56,7 +52,7 @@ index d73de9eb8..8b9c017bd 100644
         return profile.isComplete() && (!onlineMode || !textures || hasTextures());
     }
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index fb7aa15c2..7d7ab2fc0 100644
+index 579a81e521fdfabfa0318d06c6760a8ab7a88c1e..e572aaaf366709fabfce556c750ba0388ab757ac 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
@@ -4,9 +4,14 @@ import com.google.common.collect.Iterables;
@ -91,6 +87,3 @@ index fb7aa15c2..7d7ab2fc0 100644
                         }
                     }
 
-- 
-2.25.1.windows.1
-
--- a/patches/server/0005-Add-getLastTickMs-api.patch
+++ b/patches/server/0005-Add-getLastTickMs-api.patch
@ -1,16 +1,11 @@
-From 264d5684617fdf1410e4409c7a6df21833d26dc0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 21:13:33 +0100
 Subject: [PATCH] Add getLastTickMs() api

---
- src/main/java/net/minecraft/server/MinecraftServer.java | 5 +++++
- src/main/java/org/bukkit/craftbukkit/CraftServer.java   | 9 +++++++++
- src/main/java/org/spigotmc/TicksPerSecondCommand.java   | 2 +-
- 3 files changed, 15 insertions(+), 1 deletion(-)

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6949761d8b..ca166e498c 100644
+index 6949761d8b1b07f49accb47d78840fd801a83b88..ca166e498c188a5f4dc979de475d827c6d75361b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -933,6 +933,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -41,7 +36,7 @@ index 6949761d8b..ca166e498c 100644
             } else {
                 this.a((CrashReport) null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c29002ac45..b0dff61d1b 100644
+index c29002ac45f007db9eb4d0609b9b4b97a8dc199a..b0dff61d1bb03d7699b345277d49bc3ebaded9e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2381,4 +2381,13 @@ public final class CraftServer implements Server {
@ -59,7 +54,7 @@ index c29002ac45..b0dff61d1b 100644
 +	// YAPFA end
 }
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index 7218f23df4..a4f6df8606 100644
+index 7218f23df4d06ff1ca612286e4a404246389ab18..a4f6df8606b0a96803f9917dc831148ea6f5bb0c 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -33,7 +33,7 @@ public class TicksPerSecondCommand extends Command
@ -71,6 +66,3 @@ index 7218f23df4..a4f6df8606 100644
         if (args.length > 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) {
             sender.sendMessage(ChatColor.GOLD + "Current Memory Usage: " + ChatColor.GREEN + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024)) + "/" + (Runtime.getRuntime().totalMemory() / (1024 * 1024)) + " mb (Max: " + (Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " mb)");
             if (!hasShownMemoryWarning) {
-- 
-2.25.1.windows.1
-
--- a/patches/server/0006-Add-config-yapfa-command-and-basic-settings.patch
+++ b/patches/server/0006-Add-config-yapfa-command-and-basic-settings.patch
@ -1,21 +1,12 @@
-From fa0ab0558fd05da9a92e2f220e6efafd84445831 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 22:31:50 +0100
 Subject: [PATCH] Add config, yapfa command and basic settings

---
- .../java/de/tr7zw/yapfa/YapfaCommand.java     | 129 +++++++++++
- src/main/java/de/tr7zw/yapfa/YapfaConfig.java | 209 ++++++++++++++++++
- .../net/minecraft/server/DedicatedServer.java |  10 +
- .../java/net/minecraft/server/Entity.java     |   2 +-
- .../net/minecraft/server/EntityLiving.java    |   2 +
- 5 files changed, 351 insertions(+), 1 deletion(-)
- create mode 100644 src/main/java/de/tr7zw/yapfa/YapfaCommand.java
- create mode 100644 src/main/java/de/tr7zw/yapfa/YapfaConfig.java

 diff --git a/src/main/java/de/tr7zw/yapfa/YapfaCommand.java b/src/main/java/de/tr7zw/yapfa/YapfaCommand.java
 new file mode 100644
-index 0000000000..76d83f3db4
+index 0000000000000000000000000000000000000000..76d83f3db4d7a18c44fccc68fb5620c84217b80b
 --- /dev/null
 +++ b/src/main/java/de/tr7zw/yapfa/YapfaCommand.java
@@ -0,0 +1,129 @@
@ -151,7 +142,7 @@ index 0000000000..76d83f3db4
 \ No newline at end of file
 diff --git a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
 new file mode 100644
-index 0000000000..35ac0206c9
+index 0000000000000000000000000000000000000000..35ac0206c9a5481191752e78f61ccf4582a86f10
 --- /dev/null
 +++ b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
@@ -0,0 +1,209 @@
@ -366,7 +357,7 @@ index 0000000000..35ac0206c9
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 578f7809cb..d697ccc427 100644
+index 578f7809cb09e746778d05b153e02c569f0d1d90..d697ccc4279a6e50f86255356c7d1b6ee9656bfe 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -7,6 +7,7 @@ import com.mojang.authlib.GameProfileRepository;
@ -394,7 +385,7 @@ index 578f7809cb..d697ccc427 100644
 
         this.setPVP(dedicatedserverproperties.pvp);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9364f40c9b..a588a4798f 100644
+index 9430cda80517b736aa07b8e57a1ae0f9f895f32d..0ad2d20eb188c8db40157f1e68d280f902eadf7f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1029,7 +1029,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -407,7 +398,7 @@ index 9364f40c9b..a588a4798f 100644
         });
         StreamAccumulator<VoxelShape> streamaccumulator = new StreamAccumulator<>(Stream.concat(stream1, stream));
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 70c2be22b7..0b92fda23e 100644
+index 4545bd371c460d360a65d80b31af7819d718c97a..168d0d852eb87357931a11077906788a61041d6b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -266,6 +266,7 @@ public abstract class EntityLiving extends Entity {
@ -426,6 +417,3 @@ index 70c2be22b7..0b92fda23e 100644
 
         if (this.isFireProof() || this.world.isClientSide) {
             this.extinguish();
-- 
-2.25.1.windows.1
-
--- a/patches/server/0007-Add-option-for-only-players-to-have-collisions-with-.patch
+++ b/patches/server/0007-Add-option-for-only-players-to-have-collisions-with-.patch
@ -1,15 +1,11 @@
-From 392f40cacbe54abdf40983ca6eba65a748d7989d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Mon, 23 Mar 2020 23:11:10 +0100
 Subject: [PATCH] Add option for only players to have collisions with Entities

---
- src/main/java/de/tr7zw/yapfa/YapfaConfig.java |  6 ++
- .../net/minecraft/server/EntityLiving.java    | 68 ++++++++++---------
- 2 files changed, 43 insertions(+), 31 deletions(-)

 diff --git a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
-index 35ac0206c..071e9f9a5 100644
+index 35ac0206c9a5481191752e78f61ccf4582a86f10..071e9f9a5447c7ff4fb15d9c5a6fced4c22739b7 100644
 --- a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
 +++ b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
@@ -206,4 +206,10 @@ public class YapfaConfig {
@ -25,7 +21,7 @@ index 35ac0206c..071e9f9a5 100644
 }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0b92fda23..3b4d2ae5a 100644
+index 168d0d852eb87357931a11077906788a61041d6b..26bbf2fc413e193507272d930e42e1ec9133abd7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2836,40 +2836,46 @@ public abstract class EntityLiving extends Entity {
@ -106,6 +102,3 @@ index 0b92fda23..3b4d2ae5a 100644
         } finally { // Tuinity start - reduce memory allocation from collideNearby
             com.tuinity.tuinity.util.CachedLists.returnTempGetEntitiesList(list);
         } // Tuinity end - reduce memory allocation from collideNearby
-- 
-2.25.1.windows.1
-
--- a/patches/server/0008-Allow-to-change-the-piston-push-limit.patch
+++ b/patches/server/0008-Allow-to-change-the-piston-push-limit.patch
@ -1,15 +1,11 @@
-From 57f33a9c1b3edc95b89073c30746a1dd7215e466 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Sun, 29 Mar 2020 00:35:03 +0100
 Subject: [PATCH] Allow to change the piston push limit

---
- src/main/java/de/tr7zw/yapfa/YapfaConfig.java               | 4 ++++
- .../java/net/minecraft/server/PistonExtendsChecker.java     | 6 +++---
- 2 files changed, 7 insertions(+), 3 deletions(-)

 diff --git a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
-index 071e9f9a5..716b2dea9 100644
+index 071e9f9a5447c7ff4fb15d9c5a6fced4c22739b7..716b2dea9b6e8d9d446e0e793b1c6f9ec16816ab 100644
 --- a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
 +++ b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
@@ -211,5 +211,9 @@ public class YapfaConfig {
@ -24,7 +20,7 @@ index 071e9f9a5..716b2dea9 100644
 }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/PistonExtendsChecker.java b/src/main/java/net/minecraft/server/PistonExtendsChecker.java
-index 95aeaaf0b..dd64aad1e 100644
+index 95aeaaf0bb07c5ecf7117dae3382b0f0aac6426f..dd64aad1ed6c2acf360e757bf0369da5fcf6be41 100644
 --- a/src/main/java/net/minecraft/server/PistonExtendsChecker.java
 +++ b/src/main/java/net/minecraft/server/PistonExtendsChecker.java
@@ -79,7 +79,7 @@ public class PistonExtendsChecker {
@ -54,6 +50,3 @@ index 95aeaaf0b..dd64aad1e 100644
                         return false;
                     }
 
-- 
-2.25.1.windows.1
-
--- a/patches/server/0009-Add-NBT-API-as-first-class-lib.patch
+++ b/patches/server/0009-Add-NBT-API-as-first-class-lib.patch
@ -1,14 +1,11 @@
-From 3d29c492e31430bd5ec8e6eaa596d11d69416010 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 2 Apr 2020 18:49:38 +0200
 Subject: [PATCH] Add NBT-API as first-class lib

---
- pom.xml | 4 ++++
- 1 file changed, 4 insertions(+)

 diff --git a/pom.xml b/pom.xml
-index 8351a3d3d..748182c43 100644
+index df21e0a9396f99b62be433246ecf098dd8ac24f4..863b375402498332bebc2b6fe1288c68ba66d92e 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -306,6 +306,10 @@
@ -22,6 +19,3 @@ index 8351a3d3d..748182c43 100644
                             </relocations>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-- 
-2.25.1.windows.1
-
--- a/patches/server/0010-Player-saving-async-FileIO.patch
+++ b/patches/server/0010-Player-saving-async-FileIO.patch
@ -1,18 +1,11 @@
-From 6dfd62dfc8291b5606e209e34bf07fa9b63f820b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Sat, 4 Apr 2020 23:23:04 +0200
 Subject: [PATCH] Player saving async FileIO

---
- .../server/AdvancementDataPlayer.java         | 106 ++++++++++--------
- .../net/minecraft/server/EntityHuman.java     |  16 ++-
- .../java/net/minecraft/server/PlayerList.java |  29 ++++-
- .../server/ServerStatisticManager.java        |  21 +++-
- .../net/minecraft/server/WorldNBTStorage.java |  29 +++--
- 5 files changed, 139 insertions(+), 62 deletions(-)

 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index 1588d101e0..6cdcca8707 100644
+index 1588d101e0939c883757a5be91b30966d456a6bf..6cdcca870766214fa44c3930ce37e286a2549467 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -27,6 +27,8 @@ import java.util.List;
@ -145,7 +138,7 @@ index 1588d101e0..6cdcca8707 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2cada09ced..321726139d 100644
+index 2cada09ced1660526e9c112c2c8d92bbf9d6ea98..321726139df8b10bf264a4cabdc55423b544ad50 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -700,11 +700,23 @@ public abstract class EntityHuman extends EntityLiving {
@ -183,7 +176,7 @@ index 2cada09ced..321726139d 100644
             nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft());
         }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3c2f1f140c..71d67cec76 100644
+index 813787435d44e0054a052e24e1ef53ea8d713637..f932086c1192307fa4d66ec3510c78a3cce6b69b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -18,6 +18,9 @@ import java.util.Map;
@ -242,7 +235,7 @@ index 3c2f1f140c..71d67cec76 100644
             serverstatisticmanager = new ServerStatisticManager(this.server, file1);
             // this.o.put(uuid, serverstatisticmanager); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 18725272f9..5033db43e3 100644
+index 18725272f920eafb655de8b923a8a85dbdc704cf..5033db43e3df5e92c45f87d6ff2ee8a5e3aeec35 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -20,6 +20,10 @@ import java.util.Map;
@ -310,7 +303,7 @@ index 18725272f9..5033db43e3 100644
                                                 ServerStatisticManager.LOGGER.warn("Invalid statistic in {}: Don't know what {} is", this.d, s2);
                                             });
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 41a1b93a9e..9517fb0465 100644
+index 41a1b93a9e0f16ed9415dfeccd490496650163cb..9517fb0465da55d140c36967891b3e476c47bdf0 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -11,6 +11,10 @@ import org.apache.logging.log4j.LogManager;
@ -363,6 +356,3 @@ index 41a1b93a9e..9517fb0465 100644
         } catch (Exception exception) {
             WorldNBTStorage.LOGGER.error("Failed to save player data for {}", entityhuman.getName(), exception); // Paper
         }
-- 
-2.25.1.windows.1
-
--- a/patches/server/0011-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch
+++ b/patches/server/0011-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch
@ -1,15 +1,12 @@
-From cc2837fdaeed0fca50be843b79f967c30d054d77 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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
 Subject: [PATCH] Akarin Avoid double I/O operation on load player file

---
- src/main/java/net/minecraft/server/WorldNBTStorage.java | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)

 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 9517fb046..c18224691 100644
+index 9517fb0465da55d140c36967891b3e476c47bdf0..c182246917d838db504286313a9426267e607e45 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -64,7 +64,8 @@ public class WorldNBTStorage {
@ -31,6 +28,3 @@ index 9517fb046..c18224691 100644
                 nbttagcompound = NBTCompressedStreamTools.a((InputStream) (new FileInputStream(file)));
             }
             // Spigot Start
-- 
-2.25.1.windows.1
-
--- a/patches/server/0012-Akarin-Save-json-list-async.patch
+++ b/patches/server/0012-Akarin-Save-json-list-async.patch
@ -1,15 +1,12 @@
-From 8ac16ccac102706d81b65e8e526c8c92dbd15069 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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
 Subject: [PATCH] Akarin Save json list async

---
- .../java/net/minecraft/server/JsonList.java   | 23 ++++++++-----------
- 1 file changed, 9 insertions(+), 14 deletions(-)

 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 9213bfb78..f2c14ba31 100644
+index 9213bfb78e92b838189161045e3945588251b486..f2c14ba3123556ea6a3d0b9c945271fa2e08aff0 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
@@ -20,6 +20,8 @@ import java.util.Iterator;
@ -65,6 +62,3 @@ index 9213bfb78..f2c14ba31 100644
     }
 
     public void load() throws IOException {
-- 
-2.25.1.windows.1
-
--- a/patches/server/0013-Purpur-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0013-Purpur-Skip-events-if-there-s-no-listeners.patch
@ -1,14 +1,11 @@
-From c164c4ad754a251e226d520da6a92787ed718fa7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 03:07:59 -0500
 Subject: [PATCH] Purpur Skip events if there's no listeners

---
- src/main/java/net/minecraft/server/CommandDispatcher.java | 2 ++
- 1 file changed, 2 insertions(+)

 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index e59151d01..4ace0e79c 100644
+index e59151d01b4710b750366a395e1e5d18caa4726f..4ace0e79c9c0110c794a345fb27203b566b4788b 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -275,6 +275,7 @@ public class CommandDispatcher {
@ -27,6 +24,3 @@ index e59151d01..4ace0e79c 100644
         entityplayer.playerConnection.sendPacket(new PacketPlayOutCommands(rootcommandnode));
     }
 
-- 
-2.25.1.windows.1
-
--- a/patches/server/0014-Purpur-Add-more-timings-timers.patch
+++ b/patches/server/0014-Purpur-Add-more-timings-timers.patch
@ -1,18 +1,11 @@
-From a2d9601f553355eaf0a3f5d8e9900cd45ccbd0bc Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Tue, 21 Apr 2020 15:49:52 +0200
 Subject: [PATCH] Purpur Add more timings timers

---
- .../co/aikar/timings/MinecraftTimings.java    | 22 +++++++++++++++++++
- .../minecraft/server/EntityInsentient.java    | 12 ++++++++++
- .../net/minecraft/server/EntityLiving.java    | 20 ++++++++++++++---
- .../server/PathfinderGoalSelector.java        |  7 +++++-
- .../net/minecraft/server/WorldServer.java     |  2 ++
- 5 files changed, 59 insertions(+), 4 deletions(-)

 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 2966c5731..ae5586737 100644
+index 2966c5731761b125d841c8f3ea80f68bc189c162..ae55867370e496043994867b31c82c37b690efc2 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -45,6 +45,28 @@ public final class MinecraftTimings {
@ -45,7 +38,7 @@ index 2966c5731..ae5586737 100644
 
     private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index f638b21a3..5466c763e 100644
+index 605bbf0174e60f795e445193a0284739ea452946..9a937623aaf59d3159038f06c1ede1a1d9bc1916 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -748,21 +748,32 @@ public abstract class EntityInsentient extends EntityLiving {
@ -90,7 +83,7 @@ index f638b21a3..5466c763e 100644
         this.M();
     }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3b4d2ae5a..617358db7 100644
+index 26bbf2fc413e193507272d930e42e1ec9133abd7..9c14854a971a8818b7fe4acca7113c1e09ad32f0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2467,7 +2467,11 @@ public abstract class EntityLiving extends Entity {
@ -160,7 +153,7 @@ index 3b4d2ae5a..617358db7 100644
         this.collideNearby();
         this.world.getMethodProfiler().exit();
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index d3f0327a2..cce7cac92 100644
+index d3f0327a2a7cdedf3fe8d10df981a9f1cb378d26..cce7cac92b3256576fb35d5d03719b15826f6ebc 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -80,7 +80,7 @@ public class PathfinderGoalSelector {
@ -203,10 +196,10 @@ index d3f0327a2..cce7cac92 100644
 
     public final Stream<PathfinderGoalWrapped> getExecutingGoals() { return d(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 908df99f3..ad3326fa9 100644
+index d1dbb3cb4060819e1fb82d700cb7a909ba6c500b..7f64c327b8a55d33fdbaa0dec62c14a3d7962ad7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1326,7 +1326,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1325,7 +1325,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
                         return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
                     });
                     gameprofilerfiller.c("tickPassenger");
@ -216,6 +209,3 @@ index 908df99f3..ad3326fa9 100644
                     gameprofilerfiller.exit();
                 }
 
-- 
-2.25.1.windows.1
-
--- a/patches/server/0015-Modify-default-configs.patch
+++ b/patches/server/0015-Modify-default-configs.patch
@ -1,15 +1,11 @@
-From e7a154d1f6ae0a6b1ca84d545cc8167dbb68c49b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Tue, 21 Apr 2020 16:14:10 +0200
 Subject: [PATCH] Modify default configs

---
- src/main/java/com/destroystokyo/paper/PaperConfig.java      | 2 +-
- src/main/java/com/destroystokyo/paper/PaperWorldConfig.java | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3b0f3127bc..afb1d30cac 100644
+index 741c06a27e664211a7023a6369f8e69cbb41a321..f48fb8c3e637d0a7259bc92e5fb090c346750e47 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -201,7 +201,7 @@ public class PaperConfig {
@ -22,7 +18,7 @@ index 3b0f3127bc..afb1d30cac 100644
         TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
         TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses"));
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e471e76493..b0b497c8cd 100644
+index e471e764935e2a89560de56959a782b02e5e8fe1..b0b497c8cdddb155722c89e69051b8c7519cd4d4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -600,7 +600,7 @@ public class PaperWorldConfig {
@ -34,6 +30,3 @@ index e471e76493..b0b497c8cd 100644
     private void hopperOptimizations() {
         cooldownHopperWhenFull = getBoolean("hopper.cooldown-when-full", cooldownHopperWhenFull);
         log("Cooldown Hoppers when Full: " + (cooldownHopperWhenFull ? "enabled" : "disabled"));
-- 
-2.25.1.windows.1
-
--- a/patches/server/0016-lithium-MixinDirection.patch
+++ b/patches/server/0016-lithium-MixinDirection.patch
@ -1,14 +1,11 @@
-From 55c54a6f3befd035220a10fdfe640663a4021ae3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Mon, 11 May 2020 21:00:44 +0200
 Subject: [PATCH] lithium MixinDirection

---
- .../java/net/minecraft/server/EnumDirection.java | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)

 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 5a0465465..e60310a53 100644
+index 5a04654657fa47cfce0709ee75c5ff0dbe07ec8c..e60310a5358e23fdf3969f5a422d66280eb465a9 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
@@ -20,13 +20,13 @@ public enum EnumDirection implements INamable {
@ -55,6 +52,3 @@ index 5a0465465..e60310a53 100644
     }
 
     public static EnumDirection a(double d0, double d1, double d2) {
-- 
-2.25.1.windows.1
-
--- a/patches/server/0017-lithium-MixinBox.patch
+++ b/patches/server/0017-lithium-MixinBox.patch
@ -1,14 +1,11 @@
-From 48bab6a46e0ddd8b02af16b3d75d2ba81458d05f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Mon, 11 May 2020 21:02:57 +0200
 Subject: [PATCH] lithium MixinBox

---
- .../net/minecraft/server/AxisAlignedBB.java   | 34 ++++++++++++++++---
- 1 file changed, 30 insertions(+), 4 deletions(-)

 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index d54bf7140..661331bc0 100644
+index d54bf71409fe299671aa3f72315f18a188b0db9d..661331bc005ba1c6ba6c6a4df22e0205bfd2b660 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -155,12 +155,38 @@ public class AxisAlignedBB {
@ -54,6 +51,3 @@ index d54bf7140..661331bc0 100644
     }
 
     public boolean equals(Object object) {
-- 
-2.25.1.windows.1
-
--- a/patches/server/0018-lithium-enum_values.patch
+++ b/patches/server/0018-lithium-enum_values.patch
@ -1,16 +1,11 @@
-From 5bae4d02da3220c14432d6cdbeb60bc5f15f950e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Mon, 11 May 2020 21:37:44 +0200
 Subject: [PATCH] lithium enum_values

---
- src/main/java/net/minecraft/server/BlockPiston.java       | 8 ++++----
- src/main/java/net/minecraft/server/EntityLiving.java      | 6 +++++-
- .../java/net/minecraft/server/PistonExtendsChecker.java   | 4 +++-
- 3 files changed, 12 insertions(+), 6 deletions(-)

 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index 4f10ca5ad..7f2ee293a 100644
+index 4f10ca5ada741b4f5ef941bb9d92a2fa6a7c44ff..7f2ee293a0206d01e44dfffe2a0714719c86712a 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -128,8 +128,9 @@ public class BlockPiston extends BlockDirectional {
@ -40,7 +35,7 @@ index 4f10ca5ad..7f2ee293a 100644
                 if (enumdirection2 != EnumDirection.DOWN && world.isBlockFacePowered(blockposition1.shift(enumdirection2), enumdirection2)) {
                     return true;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 617358db7..029454d1a 100644
+index 9c14854a971a8818b7fe4acca7113c1e09ad32f0..3544033ad0f9e69fd8fdf0f76f96bc453354f675 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2566,10 +2566,14 @@ public abstract class EntityLiving extends Entity {
@ -60,7 +55,7 @@ index 617358db7..029454d1a 100644
 
         for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/server/PistonExtendsChecker.java b/src/main/java/net/minecraft/server/PistonExtendsChecker.java
-index dd64aad1e..18a136213 100644
+index dd64aad1ed6c2acf360e757bf0369da5fcf6be41..18a136213565794addf35511de23e078065af5f2 100644
 --- a/src/main/java/net/minecraft/server/PistonExtendsChecker.java
 +++ b/src/main/java/net/minecraft/server/PistonExtendsChecker.java
@@ -167,9 +167,11 @@ public class PistonExtendsChecker {
@ -76,6 +71,3 @@ index dd64aad1e..18a136213 100644
         int i = aenumdirection.length;
 
         for (int j = 0; j < i; ++j) {
-- 
-2.25.1.windows.1
-
--- a/patches/server/0019-lithium-MixinAxisCycleDirection.patch
+++ b/patches/server/0019-lithium-MixinAxisCycleDirection.patch
@ -1,16 +1,12 @@
-From ad0c0ae4648157fe26fe74cb934c51fa81827b24 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Mon, 11 May 2020 21:50:18 +0200
 Subject: [PATCH] lithium MixinAxisCycleDirection

---
- .../net/minecraft/server/EnumAxisCycle.java   | 90 +++++++++++++++++++
- 1 file changed, 90 insertions(+)
- create mode 100644 src/main/java/net/minecraft/server/EnumAxisCycle.java

 diff --git a/src/main/java/net/minecraft/server/EnumAxisCycle.java b/src/main/java/net/minecraft/server/EnumAxisCycle.java
 new file mode 100644
-index 000000000..d05cddcc9
+index 0000000000000000000000000000000000000000..d05cddcc90e220c42548b2eb7b190fc63e9d51f5
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/EnumAxisCycle.java
@@ -0,0 +1,90 @@
@ -104,6 +100,3 @@ index 000000000..d05cddcc9
 +        return EnumAxisCycle.e[Math.floorMod(enumdirection_enumaxis1.ordinal() - enumdirection_enumaxis.ordinal(), 3)];
 +    }
 +}
-- 
-2.25.1.windows.1
-
--- a/patches/server/0020-lithium-MixinGoalSelector.patch
+++ b/patches/server/0020-lithium-MixinGoalSelector.patch
@ -1,15 +1,12 @@
-From 742f9a3ff915a3d72d74d99e2c601a9f15feaa1e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Mon, 11 May 2020 22:07:17 +0200
 Subject: [PATCH] lithium MixinGoalSelector

 Only replaces the set type, might want to also port the logic rewrite in the future
---
- .../java/net/minecraft/server/PathfinderGoalSelector.java    | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)

 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index cce7cac92..3bfbb169f 100644
+index cce7cac92b3256576fb35d5d03719b15826f6ebc..3bfbb169f3fdac2405a5bddc76a3c1f0e80dbf5c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -1,7 +1,8 @@
@ -31,6 +28,3 @@ index cce7cac92..3bfbb169f 100644
     private final Supplier<GameProfilerFiller> e;
     private final EnumSet<PathfinderGoal.Type> f = EnumSet.noneOf(PathfinderGoal.Type.class); // Paper unused, but dummy to prevent plugins from crashing as hard. Theyll need to support paper in a special case if this is super important, but really doesn't seem like it would be.
     private final OptimizedSmallEnumSet<PathfinderGoal.Type> goalTypes = new OptimizedSmallEnumSet<>(PathfinderGoal.Type.class); // Paper - remove streams from pathfindergoalselector
-- 
-2.25.1.windows.1
-
--- a/patches/server/0021-lithium-MixinLandPathNodeMaker.patch
+++ b/patches/server/0021-lithium-MixinLandPathNodeMaker.patch
@ -1,14 +1,11 @@
-From e8af8f1c75a60a935b84cad9356ed7ddc5f4dae4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Mon, 11 May 2020 22:56:27 +0200
 Subject: [PATCH] lithium MixinLandPathNodeMaker

---
- .../minecraft/server/PathfinderNormal.java    | 57 +++++++++++++++++--
- 1 file changed, 51 insertions(+), 6 deletions(-)

 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index ec55785af..87d6caa40 100644
+index ec55785af2b432b692d3a3bf4298ffb32489bf3b..87d6caa404f96f7aae586302d2a46420d0662f64 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
@@ -4,12 +4,23 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
@ -97,6 +94,3 @@ index ec55785af..87d6caa40 100644
                 }
             } else {
                 return PathType.FENCE;
-- 
-2.25.1.windows.1
-
--- a/patches/server/0022-lithium-MixinBiome.patch
+++ b/patches/server/0022-lithium-MixinBiome.patch
@ -1,17 +1,12 @@
-From 25534c1f9b7f6fc7d0394851f278a520d738ad11 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Tue, 12 May 2020 00:38:31 +0200
 Subject: [PATCH] lithium MixinBiome

---
- .../common/util/collections/HashedList.java   | 168 ++++++++++++++++++
- .../java/net/minecraft/server/BiomeBase.java  |   4 +-
- 2 files changed, 171 insertions(+), 1 deletion(-)
- create mode 100644 src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java

 diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java
 new file mode 100644
-index 000000000..a2e3e96e1
+index 0000000000000000000000000000000000000000..a2e3e96e1e96c152de820283c1f8cb6248321f54
 --- /dev/null
 +++ b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java
@@ -0,0 +1,168 @@
@ -185,7 +180,7 @@ index 000000000..a2e3e96e1
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 798d84795..897e56f0c 100644
+index 52ebdfcc03ae2d8576a98566e7a99c617f87e19e..82dc2a16c657c1562f2c84232e69f9aa3f191f51 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
@@ -7,6 +7,8 @@ import com.google.common.collect.Sets;
@ -206,6 +201,3 @@ index 798d84795..897e56f0c 100644
             }
 
         } else {
-- 
-2.25.1.windows.1
-
--- a/patches/server/0023-Item-stuck-sleep-config.patch
+++ b/patches/server/0023-Item-stuck-sleep-config.patch
@ -1,15 +1,11 @@
-From 86be96f8ba8285729813e2e397c762b4123c1357 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Tue, 16 Jun 2020 17:29:20 +0200
 Subject: [PATCH] Item stuck sleep config

---
- src/main/java/de/tr7zw/yapfa/YapfaConfig.java      | 5 +++++
- src/main/java/net/minecraft/server/EntityItem.java | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)

 diff --git a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
-index 716b2dea9..a158e9dc8 100644
+index 716b2dea9b6e8d9d446e0e793b1c6f9ec16816ab..a158e9dc8b295f13c7ab73747cecd4c8dccce66f 100644
 --- a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
 +++ b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
@@ -216,4 +216,9 @@ public class YapfaConfig {
@ -24,7 +20,7 @@ index 716b2dea9..a158e9dc8 100644
 }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index a7860cb4d..6c320dca0 100644
+index a7860cb4ded3e9f949e6e1a7a2afacd738da756e..6c320dca0c11452f3c98c318bb1e5a635222f5ff 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -81,7 +81,7 @@ public class EntityItem extends Entity {
@ -36,6 +32,3 @@ index a7860cb4d..6c320dca0 100644
                 this.noclip = !this.world.getCubes(this);
                 if (this.noclip) {
                     this.k(this.locX(), (this.getBoundingBox().minY + this.getBoundingBox().maxY) / 2.0D, this.locZ());
-- 
-2.25.1.windows.1
-
--- a/patches/server/0024-Option-for-simpler-Villagers.patch
+++ b/patches/server/0024-Option-for-simpler-Villagers.patch
@ -1,16 +1,12 @@
-From 41a6bfdd6dc58410f9b3e347f4e7b8c1b787cd4e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Fri, 19 Jun 2020 19:21:35 +0200
 Subject: [PATCH] Option for simpler Villagers

 Option to extremly simplefy the villager AI.
---
- src/main/java/de/tr7zw/yapfa/YapfaConfig.java | 10 +++
- .../net/minecraft/server/EntityVillager.java  | 83 ++++++++++++++++++-
- 2 files changed, 92 insertions(+), 1 deletion(-)

 diff --git a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
-index a158e9dc8..aea46527b 100644
+index a158e9dc8b295f13c7ab73747cecd4c8dccce66f..aea46527b5be9ea4d06d7d68c6b9a8aec0b7e4c9 100644
 --- a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
 +++ b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java
@@ -221,4 +221,14 @@ public class YapfaConfig {
@ -30,7 +26,7 @@ index a158e9dc8..aea46527b 100644
 }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index bf019043a..5db697b66 100644
+index bf019043a9338aca8d91da809f1d5520531386e7..5db697b66d813ef63a8aed8d12667c3e710cd2df 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -7,6 +7,8 @@ import com.mojang.datafixers.util.Pair;
@ -189,6 +185,3 @@ index bf019043a..5db697b66 100644
         if (this.world instanceof WorldServer) {
             MinecraftServer minecraftserver = ((WorldServer) this.world).getMinecraftServer();
 
-- 
-2.25.1.windows.1
-
--- a/patches/server/0025-Heavily-optimize-furnance-fuel-and-recipe-lookups.patch
+++ b/patches/server/0025-Heavily-optimize-furnance-fuel-and-recipe-lookups.patch
@ -1,15 +1,11 @@
-From 40fa0bc6f6838a9bb268864cc02a03b6c1e7e4d8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 25 Jun 2020 23:40:12 +0200
 Subject: [PATCH] Heavily optimize furnance fuel and recipe lookups

---
- .../net/minecraft/server/CraftingManager.java | 19 +++++++++++++++-
- .../minecraft/server/TileEntityFurnace.java   | 22 +++++++++++++++++++
- 2 files changed, 40 insertions(+), 1 deletion(-)

 diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java
-index f27c7041c..384cb3c62 100644
+index f27c7041cdc2f062f0abb222b02026194ab33c60..384cb3c62a3fb0972cf6058b219d1e0731a8dc0d 100644
 --- a/src/main/java/net/minecraft/server/CraftingManager.java
 +++ b/src/main/java/net/minecraft/server/CraftingManager.java
@@ -89,7 +89,24 @@ public class CraftingManager extends ResourceDataJson {
@ -39,7 +35,7 @@ index f27c7041c..384cb3c62 100644
 
     public <C extends IInventory, T extends IRecipe<C>> List<T> a(Recipes<T> recipes) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 59aa2f8a7..7b1d20d39 100644
+index 59aa2f8a797482c43fd47d3bce936772ad3cd6aa..7b1d20d395ffd264b23dccba230f5e6205796b56 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -99,7 +99,13 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@ -84,6 +80,3 @@ index 59aa2f8a7..7b1d20d39 100644
 +    // YAPFA end
 +    
 }
-- 
-2.25.1.windows.1
-
--- a/patches/server/0026-Optimize-Hopper-logic.patch
+++ b/patches/server/0026-Optimize-Hopper-logic.patch
@ -1,17 +1,11 @@
-From fa38c57d5703a679e32da11c43f51706281d40f1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Fri, 26 Jun 2020 01:11:47 +0200
 Subject: [PATCH] Optimize Hopper logic

---
- .../net/minecraft/server/BlockDropper.java    |   2 +-
- .../net/minecraft/server/BlockHopper.java     | 230 ++++++++++++++++++
- .../minecraft/server/TileEntityHopper.java    |  70 +++++-
- 3 files changed, 291 insertions(+), 11 deletions(-)
- create mode 100644 src/main/java/net/minecraft/server/BlockHopper.java

 diff --git a/src/main/java/net/minecraft/server/BlockDropper.java b/src/main/java/net/minecraft/server/BlockDropper.java
-index 1ce89c28c2..1b360140b6 100644
+index 1ce89c28c2b54278dc8f1c17f2d0ccb743a27b34..1b360140b6161e9cae96752943d574200b5ced4e 100644
 --- a/src/main/java/net/minecraft/server/BlockDropper.java
 +++ b/src/main/java/net/minecraft/server/BlockDropper.java
@@ -36,7 +36,7 @@ public class BlockDropper extends BlockDispenser {
@ -25,7 +19,7 @@ index 1ce89c28c2..1b360140b6 100644
                 if (iinventory == null) {
 diff --git a/src/main/java/net/minecraft/server/BlockHopper.java b/src/main/java/net/minecraft/server/BlockHopper.java
 new file mode 100644
-index 0000000000..31ee358f82
+index 0000000000000000000000000000000000000000..31ee358f82c2193fa7f2fc4e01798126be89f349
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/BlockHopper.java
@@ -0,0 +1,230 @@
@ -261,7 +255,7 @@ index 0000000000..31ee358f82
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 20df9bd21d..a7f9d3e5ec 100644
+index 20df9bd21d0e4d2579d05d79672da2eb26478044..a7f9d3e5ec1d582eb7101d5b6a969281b15be028 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -2,6 +2,7 @@ package net.minecraft.server;
@ -382,6 +376,3 @@ index 20df9bd21d..a7f9d3e5ec 100644
 +    // YAPFA end
 +    
 }
-- 
-2.25.1.windows.1
-
--- a/patches/server/0027-Optimize-TileEntity-loading.patch
+++ b/patches/server/0027-Optimize-TileEntity-loading.patch
@ -1,15 +1,11 @@
-From 2bb2f43c34ce219ab0fa4adb901b2774b0584d5d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Fri, 17 Jul 2020 01:10:17 +0200
 Subject: [PATCH] Optimize TileEntity loading

---
- .../mods/lithium/common/util/collections/HashedList.java   | 5 ++---
- src/main/java/net/minecraft/server/World.java              | 7 +++++--
- 2 files changed, 7 insertions(+), 5 deletions(-)

 diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java
-index a2e3e96e1e..1725fc7284 100644
+index a2e3e96e1e96c152de820283c1f8cb6248321f54..1725fc72846949fa08009ca5bec6214828bbbf3c 100644
 --- a/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java
 +++ b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java
@@ -1,11 +1,10 @@
@ -35,7 +31,7 @@ index a2e3e96e1e..1725fc7284 100644
 }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4a956f3681..98196c11e6 100644
+index 4a956f36812f36ea9898cb9e0c231ddb5eaa12cd..98196c11e6b22b14c0c23ae877559f06a5795a0f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
@ -66,6 +62,3 @@ index 4a956f3681..98196c11e6 100644
     protected final java.util.Set<TileEntity> tileEntityListUnload = com.google.common.collect.Sets.newHashSet();
     public final Thread serverThread;
     private final boolean debugWorld;
-- 
-2.25.1.windows.1
-