From ef024e1fcce52244de7740d2daa664766c0c5755 Mon Sep 17 00:00:00 2001
From: Ben Kerllenevich <ben@omega24.dev>
Date: Fri, 3 Dec 2021 11:51:10 -0500
Subject: [PATCH] rebase

---
 gradle.properties                                    |  2 +-
 patches/server/0002-Rebrand.patch                    |  8 ++++----
 patches/server/0003-Purpur-config-files.patch        | 10 +++++-----
 patches/server/0006-Ridables.patch                   |  6 +++---
 patches/server/0012-Bring-back-server-name.patch     |  4 ++--
 .../server/0013-Configurable-server-mod-name.patch   |  4 ++--
 patches/server/0015-Lagging-threshold.patch          | 10 +++++-----
 patches/server/0052-Configurable-TPS-Catchup.patch   |  4 ++--
 .../0066-Add-5-second-tps-average-in-tps.patch       | 12 ++++++------
 patches/server/0129-Implement-TPSBar.patch           |  4 ++--
 ...Redirect-System.out-calls-to-plugin-loggers.patch |  4 ++--
 patches/server/0207-Add-uptime-command.patch         |  4 ++--
 ...-Added-the-ability-to-add-combustible-items.patch |  4 ++--
 patches/server/0242-UPnP-Port-Forwarding.patch       |  6 +++---
 14 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 011949c0c..251b67a7a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.18-R0.1-SNAPSHOT
 mcVersion = 1.18
 packageVersion = 1_18_R1
 
-paperCommit = 057adb04f18f319dafeecd2e4294dd090c8360d1
+paperCommit = 1f5b013cbedc28249353c735f11317ee778c812f
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch
index 75232b140..38ddfad52 100644
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -117,10 +117,10 @@ index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..8c3c68465197fafc14849dc38a572e30
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 893badbe321fa974cb82f5f11ab590bb3827f8b8..f1fbd740706fd0679643be466bf5fa4905dbe453 100644
+index 481a5dbad82f3f8dd5b1bf8ab207d82ec73d5bbd..7ad6b7b3094156477570b738026d88cb0f0f4f9e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1708,7 +1708,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1709,7 +1709,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -149,10 +149,10 @@ index 38a0fb9a7c4ade9cacfd30dffabfea7e6b773981..fd3d3e22613511a42f7fc343079b081c
              // Spigot end
              DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d938dc26886aa8a64c11db5e49fe5639bc27e1fb..5f9b87bb36a56ea457f7819c1df9c87661f781c5 100644
+index 02e25451737841001363f4697fd05b1e2c6240cd..a4024cba49bcd2170206c6f1439e081129be3d15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -255,7 +255,7 @@ import javax.annotation.Nullable; // Paper
+@@ -253,7 +253,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch
index 659dc13d0..75095735a 100644
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -106,10 +106,10 @@ index c2220d5157d3065a256cd17410760c6aedf24987..729d11569e59e78a0fda67697fe9e27a
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
          this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5f9b87bb36a56ea457f7819c1df9c87661f781c5..f4df373b5b7006b476bf0beaf57a3c5771e5e21d 100644
+index a4024cba49bcd2170206c6f1439e081129be3d15..aa9a7cdc4431a803279bb2325e0eaed7579aafd6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -933,6 +933,7 @@ public final class CraftServer implements Server {
+@@ -931,6 +931,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -117,7 +117,7 @@ index 5f9b87bb36a56ea457f7819c1df9c87661f781c5..f4df373b5b7006b476bf0beaf57a3c57
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -973,6 +974,7 @@ public final class CraftServer implements Server {
+@@ -971,6 +972,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -125,7 +125,7 @@ index 5f9b87bb36a56ea457f7819c1df9c87661f781c5..f4df373b5b7006b476bf0beaf57a3c57
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -988,6 +990,7 @@ public final class CraftServer implements Server {
+@@ -986,6 +988,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -133,7 +133,7 @@ index 5f9b87bb36a56ea457f7819c1df9c87661f781c5..f4df373b5b7006b476bf0beaf57a3c57
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2550,6 +2553,18 @@ public final class CraftServer implements Server {
+@@ -2547,6 +2550,18 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  
diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch
index 3f4d0029e..ead03a0bf 100644
--- a/patches/server/0006-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -22,10 +22,10 @@ index 14610e6144ec144ebbec6fb0945c67bb0ea86795..6833eb5dc7aa64bef1b3b38de5e282bd
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f1fbd740706fd0679643be466bf5fa4905dbe453..433953fb505b1bfaf18e9afdcfa9577a6f18655c 100644
+index 7ad6b7b3094156477570b738026d88cb0f0f4f9e..973ea150c2f8ac136736b4ae9f505491e2fc80c2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1586,6 +1586,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1587,6 +1587,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -4370,7 +4370,7 @@ index ea0040a3494709efb4819c7530dbcc37aa62e86a..5025d4571a34fe9e0e58ada6b81b0647
          this.level.getProfiler().pop();
          PiglinBruteAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index dbd17107f08c218d88ef075fc04823b83083648b..033c64fb98e08a67636c1c5e3d67b15ba0c0098b 100644
+index 0ac3d6b25857bc5af0a4909a70053eeb86ea48ea..1b174af3c47cb49d4ee4b7a6968e24510b3730eb 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -151,6 +151,23 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0012-Bring-back-server-name.patch b/patches/server/0012-Bring-back-server-name.patch
index baa27a225..a1e356d50 100644
--- a/patches/server/0012-Bring-back-server-name.patch
+++ b/patches/server/0012-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index f944e6beafc7876ed9c6923a22f58d82967b77cb..e1c7b7a659e56fa5b3a1f52cb2ccc99b
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f4df373b5b7006b476bf0beaf57a3c5771e5e21d..94ab78c63e7b730a9a06eb0b50e80d50df73023c 100644
+index aa9a7cdc4431a803279bb2325e0eaed7579aafd6..6111fd7296e030c1f03137c98439b5cb6d2bddc3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2719,4 +2719,11 @@ public final class CraftServer implements Server {
+@@ -2716,4 +2716,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server/0013-Configurable-server-mod-name.patch b/patches/server/0013-Configurable-server-mod-name.patch
index f60e0da5a..0b7b9c666 100644
--- a/patches/server/0013-Configurable-server-mod-name.patch
+++ b/patches/server/0013-Configurable-server-mod-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 433953fb505b1bfaf18e9afdcfa9577a6f18655c..a6b5a8ff4f72404b69cf08a485632db23967e801 100644
+index 973ea150c2f8ac136736b4ae9f505491e2fc80c2..1cb6c989a0b21df7dff72062550daa09721d7687 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1709,7 +1709,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1710,7 +1710,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/patches/server/0015-Lagging-threshold.patch b/patches/server/0015-Lagging-threshold.patch
index a72e9d40c..ca8edc070 100644
--- a/patches/server/0015-Lagging-threshold.patch
+++ b/patches/server/0015-Lagging-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a6b5a8ff4f72404b69cf08a485632db23967e801..358dcf61cd5f27c77709d175b15e84338858c739 100644
+index 1cb6c989a0b21df7dff72062550daa09721d7687..4d89c9de4b4aae4452750fb941a2e610b8834039 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -303,6 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
      private static final int SAMPLE_INTERVAL = 20; // Paper
      public final double[] recentTps = new double[ 3 ];
@@ -16,7 +16,7 @@ index a6b5a8ff4f72404b69cf08a485632db23967e801..358dcf61cd5f27c77709d175b15e8433
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
      public static long currentTickLong = 0L; // Paper
-@@ -1246,6 +1247,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1247,6 +1248,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                          this.recentTps[1] = tps5.getAverage();
                          this.recentTps[2] = tps15.getAverage();
                          // Paper end
@@ -25,10 +25,10 @@ index a6b5a8ff4f72404b69cf08a485632db23967e801..358dcf61cd5f27c77709d175b15e8433
                      }
                      // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 94ab78c63e7b730a9a06eb0b50e80d50df73023c..a4533e553d199e041014446874a3b5c2f6901431 100644
+index 6111fd7296e030c1f03137c98439b5cb6d2bddc3..bfa7be57dbfb31e4a3d53f3138dd9578fbdad617 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2725,5 +2725,10 @@ public final class CraftServer implements Server {
+@@ -2722,5 +2722,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }
diff --git a/patches/server/0052-Configurable-TPS-Catchup.patch b/patches/server/0052-Configurable-TPS-Catchup.patch
index c2683a7f2..a951e7857 100644
--- a/patches/server/0052-Configurable-TPS-Catchup.patch
+++ b/patches/server/0052-Configurable-TPS-Catchup.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 358dcf61cd5f27c77709d175b15e84338858c739..f8668a3664d8feb7cae7c037e0f265253ed76313 100644
+index 4d89c9de4b4aae4452750fb941a2e610b8834039..55067e47a9907f038bf77f5dda2f395773472ceb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1265,7 +1265,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1266,7 +1266,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.tickServer(this::haveTime);
                      this.profiler.popPush("nextTickWait");
                      this.mayHaveDelayedTasks = true;
diff --git a/patches/server/0066-Add-5-second-tps-average-in-tps.patch b/patches/server/0066-Add-5-second-tps-average-in-tps.patch
index 3b647d48f..14cdcad65 100644
--- a/patches/server/0066-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0066-Add-5-second-tps-average-in-tps.patch
@@ -27,10 +27,10 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f8668a3664d8feb7cae7c037e0f265253ed76313..bacc37f3478ea45f840fffcb72284c2908b8dcf7 100644
+index 55067e47a9907f038bf77f5dda2f395773472ceb..70dfa4d3b7a2c9b2a47000bf26100f174ab67d46 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -302,7 +302,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -303,7 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static final int TPS = 20;
      public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
      private static final int SAMPLE_INTERVAL = 20; // Paper
@@ -39,7 +39,7 @@ index f8668a3664d8feb7cae7c037e0f265253ed76313..bacc37f3478ea45f840fffcb72284c29
      public boolean lagging = false; // Purpur
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
-@@ -1149,6 +1149,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1150,6 +1150,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -47,7 +47,7 @@ index f8668a3664d8feb7cae7c037e0f265253ed76313..bacc37f3478ea45f840fffcb72284c29
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1239,13 +1240,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1240,13 +1241,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      {
                          final long diff = curTime - tickSection;
                          java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -69,10 +69,10 @@ index f8668a3664d8feb7cae7c037e0f265253ed76313..bacc37f3478ea45f840fffcb72284c29
                          lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a4533e553d199e041014446874a3b5c2f6901431..55baa26e2938ad8cb04a3b5f468db6ebea28b1ff 100644
+index bfa7be57dbfb31e4a3d53f3138dd9578fbdad617..ad2f47668c61e8e0023da8349c5fcec28b46b32f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2507,6 +2507,7 @@ public final class CraftServer implements Server {
+@@ -2504,6 +2504,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0129-Implement-TPSBar.patch b/patches/server/0129-Implement-TPSBar.patch
index b30974e19..0c41f4f3b 100644
--- a/patches/server/0129-Implement-TPSBar.patch
+++ b/patches/server/0129-Implement-TPSBar.patch
@@ -17,10 +17,10 @@ index be6009edf26ee468980e7d0f33b989f0121f3011..6914b9a27798ee1f4f4169ff70b9cc4e
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bacc37f3478ea45f840fffcb72284c2908b8dcf7..8634c7ca5db006ef0f27a455f30e15e1d64fdaa6 100644
+index 70dfa4d3b7a2c9b2a47000bf26100f174ab67d46..e759c7f4686a88fdfd15d9ecd6b891f60b026468 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1123,6 +1123,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1124,6 +1124,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.safeShutdown(flag, false);
      }
      public void safeShutdown(boolean flag, boolean isRestarting) {
diff --git a/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch
index 8603949c5..80d75078e 100644
--- a/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch
+++ b/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch
@@ -20,10 +20,10 @@ index 455776981274e64724376a3182b60784b56db9cf..cd859eec6b0bee44bce83614e5570938
  
          thread.setDaemon(true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 55baa26e2938ad8cb04a3b5f468db6ebea28b1ff..a8e037522300f3c9ba455f5ea505d0f375e3e39d 100644
+index ad2f47668c61e8e0023da8349c5fcec28b46b32f..6659d55234a18a8ddff7489565842d7019cd5701 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -295,7 +295,7 @@ public final class CraftServer implements Server {
+@@ -293,7 +293,7 @@ public final class CraftServer implements Server {
      public int reloadCount;
      private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
      public static Exception excessiveVelEx; // Paper - Velocity warnings
diff --git a/patches/server/0207-Add-uptime-command.patch b/patches/server/0207-Add-uptime-command.patch
index e17f1e5b4..1fe0cda81 100644
--- a/patches/server/0207-Add-uptime-command.patch
+++ b/patches/server/0207-Add-uptime-command.patch
@@ -17,10 +17,10 @@ index 6914b9a27798ee1f4f4169ff70b9cc4e2b61d9b4..99e94cbb4696164fc686cea739594eec
          }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8634c7ca5db006ef0f27a455f30e15e1d64fdaa6..8506e7e38959a6ae02777bb32268e6ba69143e83 100644
+index e759c7f4686a88fdfd15d9ecd6b891f60b026468..3d45aa3cf8e25790dba332105c397dce2b1ef5b1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -293,6 +293,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
      //public ConsoleReader reader; // Paper
      public static int currentTick = 0; // Paper - Further improve tick loop
diff --git a/patches/server/0233-Added-the-ability-to-add-combustible-items.patch b/patches/server/0233-Added-the-ability-to-add-combustible-items.patch
index e87202265..52aac4f23 100644
--- a/patches/server/0233-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0233-Added-the-ability-to-add-combustible-items.patch
@@ -51,10 +51,10 @@ index 600a71b8da335ddfc70f782cbbb08647ae98a89c..e7387a287ac84dcf8f39c547538432e5
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a8e037522300f3c9ba455f5ea505d0f375e3e39d..130d295cb703e1bfe6eb4409431c4adbb7153f50 100644
+index 6659d55234a18a8ddff7489565842d7019cd5701..266d662f10d76f4ad67b56c9eef72e9aa195ea88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1421,6 +1421,19 @@ public final class CraftServer implements Server {
+@@ -1418,6 +1418,19 @@ public final class CraftServer implements Server {
          return true;
      }
  
diff --git a/patches/server/0242-UPnP-Port-Forwarding.patch b/patches/server/0242-UPnP-Port-Forwarding.patch
index 2671584a0..42811698a 100644
--- a/patches/server/0242-UPnP-Port-Forwarding.patch
+++ b/patches/server/0242-UPnP-Port-Forwarding.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] UPnP Port Forwarding
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8506e7e38959a6ae02777bb32268e6ba69143e83..85da17adb5991a79ce35b8919e242e90c4c55d21 100644
+index 3d45aa3cf8e25790dba332105c397dce2b1ef5b1..5d1bd07046af00aea3bde2f1000a4b8a1d8528cb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -308,6 +308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
      public static long currentTickLong = 0L; // Paper
@@ -16,7 +16,7 @@ index 8506e7e38959a6ae02777bb32268e6ba69143e83..85da17adb5991a79ce35b8919e242e90
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -1032,6 +1033,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1033,6 +1034,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit end
          MinecraftServer.LOGGER.info("Stopping server");
          MinecraftTimings.stopServer(); // Paper