From d2eba2c820b52b742eb542c6d2c4d76e3d743570 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 26 Aug 2023 18:29:15 +1000
Subject: [PATCH] Rebuild patches

---
 CraftBukkit-Patches/0008-Spigot-Timings.patch | 26 +++++++++----------
 .../0027-Watchdog-Thread.patch                | 24 ++++++++---------
 ...Configurable-Amount-of-Netty-Threads.patch | 12 ++++-----
 ...2-Log-Cause-of-Unexpected-Exceptions.patch |  8 +++---
 ...Try-and-Debug-Crash-Reports-Crashing.patch |  8 +++---
 .../0040-Highly-Optimized-Tick-Loop.patch     | 18 ++++++-------
 ...n-client-crashes-server-lists-and-Mo.patch |  8 +++---
 ...able-save-on-stop-only-for-UserCache.patch | 12 ++++-----
 8 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/CraftBukkit-Patches/0008-Spigot-Timings.patch b/CraftBukkit-Patches/0008-Spigot-Timings.patch
index 939335a0..ddb52d66 100644
--- a/CraftBukkit-Patches/0008-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0008-Spigot-Timings.patch
@@ -1,4 +1,4 @@
-From f1709db0d3cae617b743457c611824d472eddfda Mon Sep 17 00:00:00 2001
+From 1ac50057ba77dc4af00708c14ceb0cb58c5de06c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Timings
 Overhauls the Timings System adding performance tracking all around the Minecraft Server
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8bc248ac54..fbb3636f23 100644
+index 26508dde06..83934abe5e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -191,6 +191,8 @@ import org.bukkit.event.player.AsyncPlayerChatPreviewEvent;
@@ -18,7 +18,7 @@ index 8bc248ac54..fbb3636f23 100644
  public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements ICommandListener, AutoCloseable {
  
      public static final Logger LOGGER = LogUtils.getLogger();
-@@ -1150,6 +1152,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1149,6 +1151,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public void onServerExit() {}
  
      public void tickServer(BooleanSupplier booleansupplier) {
@@ -26,7 +26,7 @@ index 8bc248ac54..fbb3636f23 100644
          long i = SystemUtils.getNanos();
  
          ++this.tickCount;
-@@ -1160,11 +1163,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1159,11 +1162,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          if (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0) { // CraftBukkit
@@ -40,7 +40,7 @@ index 8bc248ac54..fbb3636f23 100644
          }
  
          this.profiler.push("tallying");
-@@ -1175,6 +1180,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1174,6 +1179,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
          this.frameTimer.logFrameDuration(k - i);
          this.profiler.pop();
@@ -49,7 +49,7 @@ index 8bc248ac54..fbb3636f23 100644
      }
  
      private ServerPing buildServerStatus() {
-@@ -1206,18 +1213,25 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1205,18 +1212,25 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public void tickChildren(BooleanSupplier booleansupplier) {
@@ -75,7 +75,7 @@ index 8bc248ac54..fbb3636f23 100644
          // Send time updates to everyone, it will get the right time from the world the player is in.
          if (this.tickCount % 20 == 0) {
              for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
-@@ -1225,6 +1239,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1224,6 +1238,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  entityplayer.connection.send(new PacketPlayOutUpdateTime(entityplayer.level().getGameTime(), entityplayer.getPlayerTime(), entityplayer.level().getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); // Add support for per player time
              }
          }
@@ -83,7 +83,7 @@ index 8bc248ac54..fbb3636f23 100644
  
          while (iterator.hasNext()) {
              WorldServer worldserver = (WorldServer) iterator.next();
-@@ -1243,7 +1258,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1242,7 +1257,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              this.profiler.push("tick");
  
              try {
@@ -93,7 +93,7 @@ index 8bc248ac54..fbb3636f23 100644
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
  
-@@ -1256,18 +1273,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1255,18 +1272,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          this.profiler.popPush("connection");
@@ -119,7 +119,7 @@ index 8bc248ac54..fbb3636f23 100644
          this.profiler.pop();
      }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9576ac1882..3f3d968949 100644
+index d2f3fc712d..e026dacece 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -59,6 +59,7 @@ import org.apache.logging.log4j.Level;
@@ -130,7 +130,7 @@ index 9576ac1882..3f3d968949 100644
  import org.bukkit.event.server.ServerCommandEvent;
  import org.bukkit.event.server.RemoteServerCommandEvent;
  // CraftBukkit end
-@@ -391,6 +392,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -390,6 +391,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
      }
  
      public void handleConsoleInputs() {
@@ -138,7 +138,7 @@ index 9576ac1882..3f3d968949 100644
          while (!this.consoleInput.isEmpty()) {
              ServerCommand servercommand = (ServerCommand) this.consoleInput.remove(0);
  
-@@ -405,6 +407,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -404,6 +406,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              // CraftBukkit end
          }
  
@@ -830,5 +830,5 @@ index c885bc7443..70794669ff 100644
 +    // Spigot end
  }
 -- 
-2.41.0
+2.42.0
 
diff --git a/CraftBukkit-Patches/0027-Watchdog-Thread.patch b/CraftBukkit-Patches/0027-Watchdog-Thread.patch
index 94fdb7e9..40a788c6 100644
--- a/CraftBukkit-Patches/0027-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0027-Watchdog-Thread.patch
@@ -1,14 +1,14 @@
-From 3be98f93059e5e55b2e80849af751d17641555d1 Mon Sep 17 00:00:00 2001
+From a83c7126bed9fb73a078ef47fa26cdb5bac17fc5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fbb3636f2..d954adfac 100644
+index 83934abe5e..8ccd952138 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1015,6 +1015,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1014,6 +1014,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      this.services.profileCache().clearExecutor();
                  }
  
@@ -16,7 +16,7 @@ index fbb3636f2..d954adfac 100644
                  // CraftBukkit start - Restore terminal to original settings
                  try {
                      reader.getTerminal().restore();
-@@ -1180,6 +1181,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1179,6 +1180,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
          this.frameTimer.logFrameDuration(k - i);
          this.profiler.pop();
@@ -25,11 +25,11 @@ index fbb3636f2..d954adfac 100644
          org.spigotmc.CustomTimingsHandler.tick(); // Spigot
      }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3f3d96894..7208f3b1c 100644
+index e026dacece..a06073f62b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -260,7 +260,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
-                 this.remoteConsole = new org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender(this.rconConsoleSource); // CraftBukkit
+@@ -259,7 +259,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+                 this.rconThread = RemoteControlListener.create(this);
              }
  
 -            if (this.getMaxTickLength() > 0L) {
@@ -38,7 +38,7 @@ index 3f3d96894..7208f3b1c 100644
  
                  thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 092652328..c1d6eef0f 100644
+index 0926523287..c1d6eef0fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1973,7 +1973,7 @@ public final class CraftServer implements Server {
@@ -64,7 +64,7 @@ index 092652328..c1d6eef0f 100644
      public org.bukkit.Server.Spigot spigot()
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
 new file mode 100644
-index 000000000..3f739e80e
+index 0000000000..3f739e80ed
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -0,0 +1,130 @@
@@ -199,7 +199,7 @@ index 000000000..3f739e80e
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 8ad8b2589..130016282 100644
+index 8ad8b25894..130016282a 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -200,4 +200,18 @@ public class SpigotConfig
@@ -223,7 +223,7 @@ index 8ad8b2589..130016282 100644
  }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
 new file mode 100644
-index 000000000..4734d4ae8
+index 0000000000..4734d4ae83
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +1,131 @@
@@ -359,5 +359,5 @@ index 000000000..4734d4ae8
 +    }
 +}
 -- 
-2.41.0
+2.42.0
 
diff --git a/CraftBukkit-Patches/0031-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0031-Configurable-Amount-of-Netty-Threads.patch
index 9e84f2b9..7ce115ca 100644
--- a/CraftBukkit-Patches/0031-Configurable-Amount-of-Netty-Threads.patch
+++ b/CraftBukkit-Patches/0031-Configurable-Amount-of-Netty-Threads.patch
@@ -1,4 +1,4 @@
-From 37d5e23c145d716d40ea17d9a052368fad5d792a Mon Sep 17 00:00:00 2001
+From 6bacb0fdeebbe42f8515a0d048ad6a8c3012e64a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:58:58 +1100
 Subject: [PATCH] Configurable Amount of Netty Threads
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Amount of Netty Threads
 This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d954adfac..01179bc91 100644
+index 8ccd952138..7db7481ebd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -343,7 +343,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -342,7 +342,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  services.profileCache().setExecutor(this);
              }
  
@@ -18,7 +18,7 @@ index d954adfac..01179bc91 100644
              this.progressListenerFactory = worldloadlistenerfactory;
              this.storageSource = convertable_conversionsession;
              this.playerDataStorage = convertable_conversionsession.createPlayerStorage();
-@@ -1598,7 +1598,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1597,7 +1597,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @Nullable
      public ServerConnection getConnection() {
@@ -28,7 +28,7 @@ index d954adfac..01179bc91 100644
  
      public boolean isReady() {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 3bb51f452..c5989e8e9 100644
+index 3bb51f4528..c5989e8e9b 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -224,4 +224,11 @@ public class SpigotConfig
@@ -44,5 +44,5 @@ index 3bb51f452..c5989e8e9 100644
 +    }
  }
 -- 
-2.40.1
+2.42.0
 
diff --git a/CraftBukkit-Patches/0032-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0032-Log-Cause-of-Unexpected-Exceptions.patch
index b2257025..af72a9dc 100644
--- a/CraftBukkit-Patches/0032-Log-Cause-of-Unexpected-Exceptions.patch
+++ b/CraftBukkit-Patches/0032-Log-Cause-of-Unexpected-Exceptions.patch
@@ -1,14 +1,14 @@
-From 8d2ad8b3b38016fcd7bf55ff7ce50271f4224eb0 Mon Sep 17 00:00:00 2001
+From aa38a7845f9124d7d28ede703dbb030339d21006 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:39:14 +1100
 Subject: [PATCH] Log Cause of Unexpected Exceptions
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 01179bc91..9d4588933 100644
+index 7db7481ebd..e91aea6c9a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -992,6 +992,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -991,6 +991,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              }
          } catch (Throwable throwable) {
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);
@@ -22,5 +22,5 @@ index 01179bc91..9d4588933 100644
  
              this.fillSystemReport(crashreport.getSystemReport());
 -- 
-2.40.1
+2.42.0
 
diff --git a/CraftBukkit-Patches/0037-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0037-Try-and-Debug-Crash-Reports-Crashing.patch
index d015bdc4..aa5af67a 100644
--- a/CraftBukkit-Patches/0037-Try-and-Debug-Crash-Reports-Crashing.patch
+++ b/CraftBukkit-Patches/0037-Try-and-Debug-Crash-Reports-Crashing.patch
@@ -1,14 +1,14 @@
-From ffbc692c1c52f482672850280689142e9727f1a6 Mon Sep 17 00:00:00 2001
+From c0c04616726ebba8c0581b1ff32b942093e9e236 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 20:56:41 +1100
 Subject: [PATCH] Try and Debug Crash Reports Crashing
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9d4588933..0b322b9fd 100644
+index e91aea6c9a..42c39e7804 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1270,7 +1270,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1269,7 +1269,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  worldserver.tick(booleansupplier);
                  worldserver.timings.doTick.stopTiming(); // Spigot
              } catch (Throwable throwable) {
@@ -25,5 +25,5 @@ index 9d4588933..0b322b9fd 100644
                  worldserver.fillReportDetails(crashreport);
                  throw new ReportedException(crashreport);
 -- 
-2.40.1
+2.42.0
 
diff --git a/CraftBukkit-Patches/0040-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0040-Highly-Optimized-Tick-Loop.patch
index 46ab563d..d448064e 100644
--- a/CraftBukkit-Patches/0040-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0040-Highly-Optimized-Tick-Loop.patch
@@ -1,14 +1,14 @@
-From 096b5291e56c7bbe2c6158479204051bbc5047c8 Mon Sep 17 00:00:00 2001
+From aad4c1034036352138246dad407cd9831f27a0bc Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 26 Jan 2017 21:50:51 +0000
 Subject: [PATCH] Highly Optimized Tick Loop
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0b322b9fd..ab7ace3f5 100644
+index 42c39e7804..2a869fc159 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -291,6 +291,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -290,6 +290,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public CommandDispatcher vanillaCommandDispatcher;
      private boolean forceTicks;
      // CraftBukkit end
@@ -21,7 +21,7 @@ index 0b322b9fd..ab7ace3f5 100644
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> function) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -949,6 +955,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -948,6 +954,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      }
  
@@ -35,7 +35,7 @@ index 0b322b9fd..ab7ace3f5 100644
      protected void runServer() {
          try {
              if (!this.initServer()) {
-@@ -959,8 +972,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -958,8 +971,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              this.statusIcon = (ServerPing.a) this.loadStatusIcon().orElse(null); // CraftBukkit - decompile error
              this.status = this.buildServerStatus();
  
@@ -48,7 +48,7 @@ index 0b322b9fd..ab7ace3f5 100644
  
                  if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
                      long j = i / 50L;
-@@ -971,6 +987,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -970,6 +986,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      this.lastOverloadWarning = this.nextTickTime;
                  }
  
@@ -66,7 +66,7 @@ index 0b322b9fd..ab7ace3f5 100644
                      this.debugCommandProfilerDelayStart = false;
                      this.debugCommandProfiler = new MinecraftServer.TimeProfiler(SystemUtils.getNanos(), this.tickCount);
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 0aab647ab..4987040ff 100644
+index 0aab647abb..4987040ff2 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -266,4 +266,9 @@ public class SpigotConfig
@@ -81,7 +81,7 @@ index 0aab647ab..4987040ff 100644
  }
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 new file mode 100644
-index 000000000..f5b6dec1c
+index 0000000000..f5b6dec1cb
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -0,0 +1,45 @@
@@ -131,5 +131,5 @@ index 000000000..f5b6dec1c
 +    }
 +}
 -- 
-2.40.1
+2.42.0
 
diff --git a/CraftBukkit-Patches/0050-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0050-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
index 4203e347..aae0c5bf 100644
--- a/CraftBukkit-Patches/0050-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
+++ b/CraftBukkit-Patches/0050-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
@@ -1,4 +1,4 @@
-From 1c0af65929064f9ad0a3498eaabb5dfc16e75b9d Mon Sep 17 00:00:00 2001
+From 79ce673998eedb636fba04cd68b099807d375f7c Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 11 Apr 2014 11:16:34 +0100
 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
@@ -6,10 +6,10 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ab7ace3f5..69fc9d696 100644
+index 2a869fc159..9afa037ba4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1424,7 +1424,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1423,7 +1423,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @DontObfuscate
      public String getServerModName() {
@@ -19,5 +19,5 @@ index ab7ace3f5..69fc9d696 100644
  
      public SystemReport fillSystemReport(SystemReport systemreport) {
 -- 
-2.40.1
+2.42.0
 
diff --git a/CraftBukkit-Patches/0060-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0060-Configurable-save-on-stop-only-for-UserCache.patch
index d536b6c4..71b02f9a 100644
--- a/CraftBukkit-Patches/0060-Configurable-save-on-stop-only-for-UserCache.patch
+++ b/CraftBukkit-Patches/0060-Configurable-save-on-stop-only-for-UserCache.patch
@@ -1,14 +1,14 @@
-From 817840855dfcd31d2be3f07aa27fde7caff44dec Mon Sep 17 00:00:00 2001
+From 1e1602ca1800f924461ef320449c460948d06da6 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 23 May 2014 18:05:10 -0400
 Subject: [PATCH] Configurable save-on-stop-only for UserCache
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 69fc9d696..3a32672af 100644
+index 9afa037ba4..79d7e6d556 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -928,6 +928,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -927,6 +927,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          } catch (IOException ioexception1) {
              MinecraftServer.LOGGER.error("Failed to unlock level {}", this.storageSource.getLevelId(), ioexception1);
          }
@@ -22,7 +22,7 @@ index 69fc9d696..3a32672af 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/UserCache.java b/src/main/java/net/minecraft/server/players/UserCache.java
-index 2a6872967..1295a3340 100644
+index 2a68729679..1295a33408 100644
 --- a/src/main/java/net/minecraft/server/players/UserCache.java
 +++ b/src/main/java/net/minecraft/server/players/UserCache.java
 @@ -127,7 +127,7 @@ public class UserCache {
@@ -44,7 +44,7 @@ index 2a6872967..1295a3340 100644
          }
  
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 285bb7a20..3540e2daf 100644
+index 285bb7a203..3540e2dafb 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -320,4 +320,10 @@ public class SpigotConfig
@@ -59,5 +59,5 @@ index 285bb7a20..3540e2daf 100644
 +    }
  }
 -- 
-2.40.1
+2.42.0