Git is driving me nuts

patches/server/0001-Yatopia-Server-Fixes.patch

@@ -1181,7 +1181,7 @@ index 963c90c065a9e362c8c3030bb36ac6bf0c14a8e2..00000000000000000000000000000000
 - 
 -     public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 06194f1fe6e2b57c1ef370d807f6faad06953b38..6250b32a9dae310561be9e8cde76aa92547d35eb 100644
+index cd6c0753bdf11c2ae7075e40cd91cc517d8d71b9..8a454e66547ccb3ec2dfef922ec46b2a4595a81a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1295,7 +1295,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1193,39 +1193,12 @@ index 06194f1fe6e2b57c1ef370d807f6faad06953b38..6250b32a9dae310561be9e8cde76aa92
              if (playerSaveInterval > 0) { // Paper
              this.playerList.savePlayers(playerSaveInterval); // Paper
              }// Paper
-@@ -1307,11 +1307,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-             }
-             // Paper end
- 
--            this.methodProfiler.exit();
-+            //this.methodProfiler.exit(); // Akarin - remove caller
-             //MinecraftServer.LOGGER.debug("Autosave finished"); // Paper
-         //} // Paper
- 
--        this.methodProfiler.enter("snooper");
-+        //this.methodProfiler.enter("snooper"); // Akarin - remove caller
-+        // Akarin - Disable Snooper
-+        /*
-         if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot
-             this.snooper.a();
-         }
-@@ -1319,8 +1321,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && this.ticks % 6000 == 0) { // Spigot
-             this.snooper.b();
-         }
-+         */
- 
--        this.methodProfiler.exit();
-+        //this.methodProfiler.exit(); // Akarin - remove caller
- 
-         // Paper start - move executeAll() into full server tick timing
-         try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java.rej b/src/main/java/net/minecraft/server/MinecraftServer.java.rej
 deleted file mode 100644
-index 2b5435d6bb0d50ce27a4d3451582d7ad816033d1..0000000000000000000000000000000000000000
+index 2a6cb738059fb4bd0cc45f0db7aad25f7c46f9e5..0000000000000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java.rej
 +++ /dev/null
-@@ -1,33 +0,0 @@
+@@ -1,10 +0,0 @@
 -diff a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java	(rejected hunks)
 -@@ -1283,7 +1283,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
 -         //if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit // Paper - move down
@@ -1236,29 +1209,6 @@ index 2b5435d6bb0d50ce27a4d3451582d7ad816033d1..00000000000000000000000000000000
 -             if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // Paper
 -             this.playerList.savePlayers();
 -             }// Paper
--@@ -1295,11 +1295,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
--             }
--             // Paper end
-- 
---            this.methodProfiler.exit();
--+            //this.methodProfiler.exit(); // Akarin - remove caller
--             //MinecraftServer.LOGGER.debug("Autosave finished"); // Paper
--         //} // Paper
-- 
---        this.methodProfiler.enter("snooper");
--+        //this.methodProfiler.enter("snooper"); // Akarin - remove caller
--         // Akarin - Disable Snooper
--         /*
--         if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot
--@@ -1311,7 +1311,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
--         }
--         */
-- 
---        this.methodProfiler.exit();
--+        //this.methodProfiler.exit(); // Akarin - remove caller
-- 
--         // Paper start - move executeAll() into full server tick timing
--         try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 index e10995ec30dd9a10d781b3c1709fd2db5a9becdd..f6ffefd7e356c9c68cb6591cab55de9363442faf 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java

patches/server/0003-Brandings.patch

@@ -39,7 +39,7 @@ index 74ed02fa9296583977bb721014b10ff8b708b43c..a13c7b2b5bc79ecaea404779149ed02c
                  .completer(new ConsoleCommandCompleter(this.server))
          );
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6250b32a9dae310561be9e8cde76aa92547d35eb..8a1772723792368b5a5b6d344c4bcb53d51dc365 100644
+index 8a454e66547ccb3ec2dfef922ec46b2a4595a81a..662a005becd1d2642ae50c25fdf3bfadf7ae6ae2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1520,7 +1520,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0005-Add-last-tick-time-API.patch

@@ -7,7 +7,7 @@ Original patch by:
 Co-authored-by: tr7zw <tr7zw@live.de>
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8a1772723792368b5a5b6d344c4bcb53d51dc365..83407ebd08c2e8b76b810df82b186e084a4be7d7 100644
+index 662a005becd1d2642ae50c25fdf3bfadf7ae6ae2..21a0656ce8a44acf45a1756add556a5c71e3eeb7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -935,6 +935,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0049-Optimize-whitelist-command-for-multiple-additions-re.patch

@@ -185,7 +185,7 @@ index 0224a6d0e47e836fa485b39e7b4ce5b83ea554bf..fe578d306575bbdc8ca4a993a648e889
          return (String[]) this.d.keySet().toArray(new String[this.d.size()]);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 83407ebd08c2e8b76b810df82b186e084a4be7d7..52a6692a356c999e74227e7cb4b5fba042e06235 100644
+index 21a0656ce8a44acf45a1756add556a5c71e3eeb7..6d62aa2b08f40479997f8bcc841cfb704b18e1b9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1959,6 +1959,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas