Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6178609 Fix tripwire state inconsistency
PaperMC/Paper@ae6fec6 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)
PaperMC/Paper@5cb2942 Update paperweight to 1.3.3 and shadow to 7.1.1
PaperMC/Paper@8a9979c Update gradle wrapper to 7.3.2
PaperMC/Paper@df8d28a Update checker framework & log4j-api for paper-api (also rebuild patches)

patches/server/0002-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8e941079410a1a0b347fa811190fb6771a185319..c2ed6509227843419d8117a6113e916cffe2aeba 100644
+index da31e84cb558e6fad9cab015cfae753ce7be7db0..07f572b9aa249e154bc08ecf8517c3953392b74f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,8 +18,12 @@ repositories {
@@ -31,7 +31,7 @@ index 8e941079410a1a0b347fa811190fb6771a185319..c2ed6509227843419d8117a6113e916c
 +    implementation("dev.omega24:upnp4j:1.0") // Purpur
  
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
-     testImplementation("junit:junit:4.13.1")
+     testImplementation("junit:junit:4.13.2")
 @@ -68,7 +74,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -148,10 +148,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 b70a6d126e80d775870cfececf6724cde89d4554..2c31a0c1e76c92aa3ca8aa97a30d79675dea7e85 100644
+index ba7023e7ca5d29375ff53c2951892138d155f69f..c94053599f30f61a67c20d61b41963ce1326db07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -253,7 +253,7 @@ import javax.annotation.Nullable; // Paper
+@@ -254,7 +254,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {

patches/server/0003-Purpur-config-files.patch

@@ -106,10 +106,10 @@ index 4247dcb003626535dbb997f48ad9f61380bd17e9..03a4c5fa746033825c26a031fbf79f72
          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 2c31a0c1e76c92aa3ca8aa97a30d79675dea7e85..5566c149b6c44a13ea65ab8ccb61055afbb2e277 100644
+index c94053599f30f61a67c20d61b41963ce1326db07..df6eec75dc80f18b7804d1b5a181b4d5fd573abb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -931,6 +931,7 @@ public final class CraftServer implements Server {
+@@ -952,6 +952,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 2c31a0c1e76c92aa3ca8aa97a30d79675dea7e85..5566c149b6c44a13ea65ab8ccb61055a
          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))
-@@ -971,6 +972,7 @@ public final class CraftServer implements Server {
+@@ -992,6 +993,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -125,7 +125,7 @@ index 2c31a0c1e76c92aa3ca8aa97a30d79675dea7e85..5566c149b6c44a13ea65ab8ccb61055a
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -986,6 +988,7 @@ public final class CraftServer implements Server {
+@@ -1007,6 +1009,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 2c31a0c1e76c92aa3ca8aa97a30d79675dea7e85..5566c149b6c44a13ea65ab8ccb61055a
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2641,6 +2644,18 @@ public final class CraftServer implements Server {
+@@ -2662,6 +2665,18 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  

patches/server/0004-Purpur-client-support.patch

@@ -43,10 +43,10 @@ index 057fcbc389e54e0c9f7a90a3e8b965cd46db9d58..7de5cf6d7ebd0ab14f1478d466cf5393
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c6cd4a5790384811f3171ce740afb9459f3d6fc0..f32a4aaa0f027b71043109c78c8a5e18e0397350 100644
+index 74acf429b97476974f844a9621d059c935fcb4bd..cf2af2734dbf3b4f35a7e3dd79233cde6c7e728a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2577,4 +2577,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2594,4 +2594,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0011-AFK-API.patch

@@ -213,7 +213,7 @@ index 6df710cecea9a5c91ccf8bdaec60bdc88a601777..6b0cee0bd6218492b184f94a84da9acf
                  if (range < 0.0D || d < range * range) {
                      return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f32a4aaa0f027b71043109c78c8a5e18e0397350..db49d331e76a0c86515cb06caba8d6e1853c77f4 100644
+index cf2af2734dbf3b4f35a7e3dd79233cde6c7e728a..a26fa7bf9f2b2213b313c7762a6af7bc548a99b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -429,10 +429,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -233,7 +233,7 @@ index f32a4aaa0f027b71043109c78c8a5e18e0397350..db49d331e76a0c86515cb06caba8d6e1
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2583,5 +2588,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2600,5 +2605,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }

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 5566c149b6c44a13ea65ab8ccb61055afbb2e277..da5651f61be49bcceb9b912f155b24c511a9a5ca 100644
+index df6eec75dc80f18b7804d1b5a181b4d5fd573abb..484111518d60c4f764f4c59b45cff96b86a6dbbe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2810,4 +2810,11 @@ public final class CraftServer implements Server {
+@@ -2831,4 +2831,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end

patches/server/0015-Lagging-threshold.patch

@@ -25,10 +25,10 @@ index 1cb6c989a0b21df7dff72062550daa09721d7687..4d89c9de4b4aae4452750fb941a2e610
                      }
                      // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index da5651f61be49bcceb9b912f155b24c511a9a5ca..cc0e2adaa6f857ad646b1a853faf7a979af9de7b 100644
+index 484111518d60c4f764f4c59b45cff96b86a6dbbe..a45996f5668cbf070a59ec8296c940b1ff08f8f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2816,5 +2816,10 @@ public final class CraftServer implements Server {
+@@ -2837,5 +2837,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }

patches/server/0018-Player-invulnerabilities.patch

@@ -121,10 +121,10 @@ index 6ec5a8a52ec06be917f2ca682f5920ed5ae1a82c..aca10a81a90c7ef81b4167b868f3893a
          return entityplayer1;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index db49d331e76a0c86515cb06caba8d6e1853c77f4..e251821c59a2a07dc6e1b3f984641a0e549c315a 100644
+index a26fa7bf9f2b2213b313c7762a6af7bc548a99b2..508c86e6481e9a4cd68d3af5d2d7709160b3479f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2603,5 +2603,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2620,5 +2620,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }

patches/server/0066-Add-5-second-tps-average-in-tps.patch

@@ -69,10 +69,10 @@ index 55067e47a9907f038bf77f5dda2f395773472ceb..70dfa4d3b7a2c9b2a47000bf26100f17
                          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 cc0e2adaa6f857ad646b1a853faf7a979af9de7b..0f3c8b754d8c349125c1debb060c3e17364aba9b 100644
+index a45996f5668cbf070a59ec8296c940b1ff08f8f2..f0f3e9d0645e882da7d71e0a1051da30f1e6a41f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2598,6 +2598,7 @@ public final class CraftServer implements Server {
+@@ -2619,6 +2619,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {

patches/server/0193-Flying-Fall-Damage-API.patch

@@ -26,10 +26,10 @@ index 4252ff0201cbfbecc7b95ca86c1763dc5d88a4d7..535bc6d57d153a62f2cbf57747586de3
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e92c9815ce3f41760e4a31b01ce90d0818657521..9879a38526648652d3c8362d7166bd0217385043 100644
+index 6691abc34043b39460eccd98311c9d8efbefa8a0..2622cf83dd501b982fdd20b31d174bb0d63d1218 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2628,5 +2628,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2645,5 +2645,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }

patches/server/0202-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 d397daf9a6b2128735a0732565a41be9197742a4..52686415c7a37c14c16537d44f6b2c6420accb87 100644
+index f0f3e9d0645e882da7d71e0a1051da30f1e6a41f..71ba48fee88aad08883ae65e0b6eb4a674343f32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -293,7 +293,7 @@ public final class CraftServer implements Server {
+@@ -294,7 +294,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

patches/server/0227-Add-force-and-prompt-parameters-to-resource-pack-api.patch

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Tue, 17 Aug 2021 17:39:21 -0500
-Subject: [PATCH] Add force and prompt parameters to resource pack api
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9879a38526648652d3c8362d7166bd0217385043..0fd434f4f2909fa03739a3a2b5c3dce5689c8a2c 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -27,6 +27,8 @@ import java.util.WeakHashMap;
- import java.util.logging.Level;
- import java.util.logging.Logger;
- import javax.annotation.Nullable;
-+
-+import io.papermc.paper.adventure.PaperAdventure;
- import net.minecraft.Util;
- import net.minecraft.advancements.AdvancementProgress;
- import net.minecraft.core.BlockPos;
-@@ -1730,11 +1732,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public void setResourcePack(String url, byte[] hash) {
-+        // Purpur start
-+        this.setResourcePack(url, hash, false, (net.kyori.adventure.text.Component) null);
-+    }
-+
-+    @Override
-+    public void setResourcePack(String url, byte[] hash, boolean force, String prompt) {
-+        this.setResourcePack(url, hash, force, prompt == null ? null : io.papermc.paper.adventure.PaperAdventure.LEGACY_SECTION_UXRC.deserialize(prompt));
-+    }
-+
-+    @Override
-+    public void setResourcePack(String url, byte[] hash, boolean force, net.kyori.adventure.text.Component prompt) {
-+        // Purpur end
-         Validate.notNull(url, "Resource pack URL cannot be null");
-         Validate.notNull(hash, "Resource pack hash cannot be null");
-         Validate.isTrue(hash.length == 20, "Resource pack hash should be 20 bytes long but was " + hash.length);
- 
--        this.getHandle().sendTexturePack(url, BaseEncoding.base16().lowerCase().encode(hash), false, null);
-+        this.getHandle().sendTexturePack(url, BaseEncoding.base16().lowerCase().encode(hash), force, prompt == null ? null : io.papermc.paper.adventure.PaperAdventure.asVanilla(prompt)); // Purpur
-     }
- 
-     public void addChannel(String channel) {

patches/server/0228-Extended-OfflinePlayer-API.patch

@@ -223,10 +223,10 @@ index 88bc0807e8bf66a65422f85f1112336334eb3de2..d0e822b329085b9d0a42276c3cacd6cb
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0fd434f4f2909fa03739a3a2b5c3dce5689c8a2c..58c250e3b7606319f422e2d716de66d916ea4b9a 100644
+index 2622cf83dd501b982fdd20b31d174bb0d63d1218..928b249faed2d79a5f74c612e5ab38ab82b0a26f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1905,6 +1905,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1908,6 +1908,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  

patches/server/0229-Added-the-ability-to-add-combustible-items.patch

@@ -51,10 +51,10 @@ index 0d9b592ebfd22dc679ba7dbfd339db4d6bc5ad44..f5fd6e0fd67c1b760000c2e75ce09d1c
      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 52686415c7a37c14c16537d44f6b2c6420accb87..00a41213ee1c03fe1835dc8bc3b12ffe5c6bbafe 100644
+index 71ba48fee88aad08883ae65e0b6eb4a674343f32..1b7a3180ff88b0db2aab6e61b286f9b4d0da6862 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1418,6 +1418,19 @@ public final class CraftServer implements Server {
+@@ -1439,6 +1439,19 @@ public final class CraftServer implements Server {
          return true;
      }
  

patches/server/0238-UPnP-Port-Forwarding.patch

@@ -5,7 +5,7 @@ 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 3d45aa3cf8e25790dba332105c397dce2b1ef5b1..5d1bd07046af00aea3bde2f1000a4b8a1d8528cb 100644
+index 022cf286342abe9f5349b70e096373a0db2a810d..58143bf03bd3314a4b7b40acb72e203aebce7fa6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa