From 0e517a7994e2c7b6948d4c205c472ed1690c7de3 Mon Sep 17 00:00:00 2001
From: Ivan Pekov <ivan@mrivanplays.com>
Date: Fri, 9 Oct 2020 14:03:00 +0300
Subject: [PATCH] For some reason this didnt wanna apply

Shrugs internally
---
 .../server/0001-Yatopia-Server-Fixes.patch    | 68 ++++++++++++++++++-
 patches/server/0003-Brandings.patch           |  4 +-
 .../server/0005-Add-last-tick-time-API.patch  |  2 +-
 ...st-command-for-multiple-additions-re.patch |  4 +-
 4 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch
index 86619dba..a5872764 100644
--- a/patches/server/0001-Yatopia-Server-Fixes.patch
+++ b/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..fbbc1ab3a77df9da7c76d456330d9c63ed190628 100644
+index 06194f1fe6e2b57c1ef370d807f6faad06953b38..6250b32a9dae310561be9e8cde76aa92547d35eb 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,6 +1193,72 @@ index 06194f1fe6e2b57c1ef370d807f6faad06953b38..fbbc1ab3a77df9da7c76d456330d9c63
              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
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java.rej
++++ /dev/null
+@@ -1,33 +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
+-             //MinecraftServer.LOGGER.debug("Autosave started"); // Paper
+-             serverAutoSave = (autosavePeriod > 0 && this.ticks % autosavePeriod == 0); // Paper
+--            this.methodProfiler.enter("save");
+-+            //this.methodProfiler.enter("save"); // Akarin - remove caller
+-             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
diff --git a/patches/server/0003-Brandings.patch b/patches/server/0003-Brandings.patch
index 8ddfe56d..03f2291b 100644
--- a/patches/server/0003-Brandings.patch
+++ b/patches/server/0003-Brandings.patch
@@ -39,10 +39,10 @@ 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 fbbc1ab3a77df9da7c76d456330d9c63ed190628..0d33028577e22f0f29b872ef5cd55de3f92ce3f0 100644
+index 6250b32a9dae310561be9e8cde76aa92547d35eb..8a1772723792368b5a5b6d344c4bcb53d51dc365 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1517,7 +1517,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1520,7 +1520,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
diff --git a/patches/server/0005-Add-last-tick-time-API.patch b/patches/server/0005-Add-last-tick-time-API.patch
index 420db587..7f7d1769 100644
--- a/patches/server/0005-Add-last-tick-time-API.patch
+++ b/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 0d33028577e22f0f29b872ef5cd55de3f92ce3f0..a1f3cbce6827c512a3befd2dcb05b31866611d89 100644
+index 8a1772723792368b5a5b6d344c4bcb53d51dc365..83407ebd08c2e8b76b810df82b186e084a4be7d7 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
diff --git a/patches/server/0049-Optimize-whitelist-command-for-multiple-additions-re.patch b/patches/server/0049-Optimize-whitelist-command-for-multiple-additions-re.patch
index 0ff71597..5840ad5d 100644
--- a/patches/server/0049-Optimize-whitelist-command-for-multiple-additions-re.patch
+++ b/patches/server/0049-Optimize-whitelist-command-for-multiple-additions-re.patch
@@ -185,10 +185,10 @@ 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 a1f3cbce6827c512a3befd2dcb05b31866611d89..753fb233c971c08d5ac358d05473628c0ee832ec 100644
+index 83407ebd08c2e8b76b810df82b186e084a4be7d7..52a6692a356c999e74227e7cb4b5fba042e06235 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1956,6 +1956,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1959,6 +1959,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          return new DataPackConfiguration(list, list1);
      }