Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@b7f79d4 Updated Upstream (Paper)
PurpurMC/Purpur@da0a61d [ci skip] move log4j plugin into proper location
PurpurMC/Purpur@1d0d781 fix rambar nbt value not being saved to player, closes #1632
PurpurMC/Purpur@a9bcd9f fix villager not restocking while lobotomized, closes #1629
PurpurMC/Purpur@9d1d9fd [ci skip] inline import
PurpurMC/Purpur@1b5ab0c Updated Upstream (Paper)
PurpurMC/Purpur@4b74604 [ci skip] enable caching (#1634)

leaf-server/minecraft-patches/features/0006-Purpur-Server-Minecraft-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Minecraft Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: dd4143984219cea8440913b7918322b5ba59265a
+Commit: 4b74604c1f9f84e87f91dd390c83850f088a736b
 
 Patches listed below are removed in this patch, They exists in Gale or Leaf:
 * "net/minecraft/CrashReport.java.patch"
@@ -118,18 +118,10 @@ index c2b7164a1395842ab95428540782eeda4c7960b0..59c70c567051bc7dba0d308387352d1b
          boolean flag = this.source.acceptsSuccess() && !this.silent;
          boolean flag1 = allowLogging && this.source.shouldInformAdmins() && !this.silent;
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 60cfa713ffc778d0cd11dfb2ea1a52db806119b2..a5cc373dbe034560865e196ce12a8361932ea085 100644
+index 60cfa713ffc778d0cd11dfb2ea1a52db806119b2..967c01f9e40c2c73f266de281425c918472cf66e 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -135,6 +135,7 @@ import net.minecraft.util.profiling.jfr.JvmProfiler;
- import net.minecraft.world.flag.FeatureFlagSet;
- import net.minecraft.world.flag.FeatureFlags;
- import net.minecraft.world.level.GameRules;
-+import org.bukkit.event.player.PlayerCommandSendEvent;
- import org.slf4j.Logger;
- 
- public class Commands {
-@@ -213,8 +214,8 @@ public class Commands {
+@@ -213,8 +213,8 @@ public class Commands {
              JfrCommand.register(this.dispatcher);
          }
  
@@ -140,7 +132,7 @@ index 60cfa713ffc778d0cd11dfb2ea1a52db806119b2..a5cc373dbe034560865e196ce12a8361
              RaidCommand.register(this.dispatcher, context);
              DebugPathCommand.register(this.dispatcher);
              DebugMobSpawningCommand.register(this.dispatcher);
-@@ -242,6 +243,14 @@ public class Commands {
+@@ -242,6 +242,14 @@ public class Commands {
              StopCommand.register(this.dispatcher);
              TransferCommand.register(this.dispatcher);
              WhitelistCommand.register(this.dispatcher);
@@ -914,7 +906,7 @@ index e52d976f0c1c5eacdc8608b204c3a178b9b17446..a13aa7b896a998975d2ee14eafb86a85
                  }
                  // Paper end - Fix merchant inventory not closing on entity removal
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index e56e930df980613a13f92d771f1036eba82b1d19..b7829a91a7ef79706ec6d90b8b2673fd369b9931 100644
+index e56e930df980613a13f92d771f1036eba82b1d19..1173deb1aeb5abc225e7b5914cc3c325afdfab16 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -392,6 +392,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -945,7 +937,7 @@ index e56e930df980613a13f92d771f1036eba82b1d19..b7829a91a7ef79706ec6d90b8b2673fd
          this.saveEnderPearls(compound);
 +        compound.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur - Implement TPSBar
 +        compound.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur - Add compass command
-+        compound.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur - Add rambar command
++        compound.putBoolean("Purpur.RamBar", this.ramBar); // Purpur - Add rambar command
      }
  
      private void saveParentVehicle(CompoundTag tag) {
@@ -12232,7 +12224,7 @@ index e6d368bc601357cfca694ce328c8e6e47491f3b5..489613b31fe47a0bd43fafddbeab6bb6
      }
  
 diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
-index a02cd34bcd643c7abad3a355043cb88d035143a0..347affae3cc18e01474734d2da2699c9b7b17e26 100644
+index a02cd34bcd643c7abad3a355043cb88d035143a0..e8e2848c12e3cf2ad86fc3bd18f03182ee291775 100644
 --- a/net/minecraft/world/entity/npc/Villager.java
 +++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -179,6 +179,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -12366,7 +12358,7 @@ index a02cd34bcd643c7abad3a355043cb88d035143a0..347affae3cc18e01474734d2da2699c9
      }
  
      public boolean assignProfessionWhenSpawned() {
-@@ -290,10 +389,18 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -290,12 +389,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          // Paper start - EAR 2
          this.customServerAiStep(level, false);
      }
@@ -12386,8 +12378,11 @@ index a02cd34bcd643c7abad3a355043cb88d035143a0..347affae3cc18e01474734d2da2699c9
 +        if (!inactive && (getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) { // Purpur - Ridables
              this.getBrain().tick(level, this); // Paper - EAR 2
          }
++        else if (this.isLobotomized && shouldRestock()) restock(); // Purpur - Lobotomize stuck villagers
          // Pufferfish end
-@@ -351,7 +458,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+         if (this.assignProfessionWhenSpawned) {
+             this.assignProfessionWhenSpawned = false;
+@@ -351,7 +459,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
              return super.mobInteract(player, hand);
          } else if (this.isBaby()) {
              this.setUnhappy();
@@ -12396,7 +12391,7 @@ index a02cd34bcd643c7abad3a355043cb88d035143a0..347affae3cc18e01474734d2da2699c9
          } else {
              if (!this.level().isClientSide) {
                  boolean isEmpty = this.getOffers().isEmpty();
-@@ -364,9 +471,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -364,9 +472,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
                  }
  
                  if (isEmpty) {
@@ -12410,7 +12405,7 @@ index a02cd34bcd643c7abad3a355043cb88d035143a0..347affae3cc18e01474734d2da2699c9
                  this.startTrading(player);
              }
  
-@@ -505,7 +615,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -505,7 +616,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      private void updateDemand() {
          for (MerchantOffer merchantOffer : this.getOffers()) {
@@ -12419,7 +12414,7 @@ index a02cd34bcd643c7abad3a355043cb88d035143a0..347affae3cc18e01474734d2da2699c9
          }
      }
  
-@@ -709,7 +819,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -709,7 +820,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      @Override
      public boolean canBreed() {
@@ -12428,7 +12423,7 @@ index a02cd34bcd643c7abad3a355043cb88d035143a0..347affae3cc18e01474734d2da2699c9
      }
  
      private boolean hungry() {
-@@ -878,7 +988,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -878,7 +989,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
  
      public boolean hasFarmSeeds() {
@@ -12437,7 +12432,7 @@ index a02cd34bcd643c7abad3a355043cb88d035143a0..347affae3cc18e01474734d2da2699c9
      }
  
      @Override
-@@ -930,6 +1040,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -930,6 +1041,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
  
      public void spawnGolemIfNeeded(ServerLevel serverLevel, long gameTime, int minVillagerAmount) {
@@ -12445,7 +12440,7 @@ index a02cd34bcd643c7abad3a355043cb88d035143a0..347affae3cc18e01474734d2da2699c9
          if (this.wantsToSpawnGolem(gameTime)) {
              AABB aabb = this.getBoundingBox().inflate(10.0, 10.0, 10.0);
              List<Villager> entitiesOfClass = serverLevel.getEntitiesOfClass(Villager.class, aabb);
-@@ -1003,6 +1114,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -1003,6 +1115,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      @Override
      public void startSleeping(BlockPos pos) {

leaf-server/minecraft-patches/features/0007-Fix-Pufferfish-and-Purpur-patches.patch

@@ -298,18 +298,6 @@ index 242b2545b6082f567d0bb7900ef06ded3c0fdcdd..85306d8f0fba3b5dcb244df54c949b45
          this.getBrain().tick(level, this);
          PiglinAi.updateActivity(this);
          super.customServerAiStep(level);
-diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
-index 347affae3cc18e01474734d2da2699c9b7b17e26..5dbf28c15f828505d42dc31c1a2185e01a7542c1 100644
---- a/net/minecraft/world/entity/npc/Villager.java
-+++ b/net/minecraft/world/entity/npc/Villager.java
-@@ -404,6 +404,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
-             this.getBrain().tick(level, this); // Paper - EAR 2
-         }
-         // Pufferfish end
-+        else if (this.isLobotomized && shouldRestock()) restock(); // Leaf - Purpur - Lobotomize stuck villagers
-         if (this.assignProfessionWhenSpawned) {
-             this.assignProfessionWhenSpawned = false;
-         }
 diff --git a/net/minecraft/world/entity/projectile/Projectile.java b/net/minecraft/world/entity/projectile/Projectile.java
 index bd93ee97982038789114f17ee369208fc6413796..0b1263000f872431e44abfdd57134b6efe245641 100644
 --- a/net/minecraft/world/entity/projectile/Projectile.java

leaf-server/minecraft-patches/features/0043-Improve-Purpur-AFK-system.patch

@@ -7,10 +7,10 @@ AFK command & command cooldown
 AFK title message
 
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index a5cc373dbe034560865e196ce12a8361932ea085..d03a6dc74877bc08b170be5add061270dc46549b 100644
+index 967c01f9e40c2c73f266de281425c918472cf66e..d8464f77c54f547161356b78e76429923937b4a7 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -243,6 +243,7 @@ public class Commands {
+@@ -242,6 +242,7 @@ public class Commands {
              StopCommand.register(this.dispatcher);
              TransferCommand.register(this.dispatcher);
              WhitelistCommand.register(this.dispatcher);
@@ -19,7 +19,7 @@ index a5cc373dbe034560865e196ce12a8361932ea085..d03a6dc74877bc08b170be5add061270
              org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur - Add demo command
              org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur - Add ping command
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 08578d7398658d226318a28324a1eae0d4453add..09c9ca038f359372bda3a3d8b743d497a530ce97 100644
+index 2da6609ab8398c5c537e9065b3a82693f43200e2..9db63f122539134003a5955aabae970645131c1c 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -2460,6 +2460,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -142,7 +142,7 @@ index 465e34eb906ec78f49ff1183b635e77a1fcaa758..39b01b3d96d03bca4c33eaddfc54edef
          this.cserver.getPluginManager().callEvent(event);
          command = event.getMessage().substring(1);
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 015c4480a60acc252342d58aa129350ab36dc29b..e4c3819de8af08f36cd30fafb6ce859005c5cb43 100644
+index 65f943dbbe6e30f0a299fdbd73b94ca60d4f406c..7d7343d4e2c206daf77a61050f2f4c229dd042cd 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -667,6 +667,7 @@ public abstract class PlayerList {

leaf-server/minecraft-patches/features/0055-Configurable-unknown-command-message.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable unknown command message
 
 
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index d03a6dc74877bc08b170be5add061270dc46549b..76f26f4fb93dd84a9b15ea662eeeadbc44a99ac5 100644
+index d8464f77c54f547161356b78e76429923937b4a7..a59162764f141d9bb88c7084c66661f14de7ad57 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -390,31 +390,9 @@ public class Commands {
+@@ -389,31 +389,9 @@ public class Commands {
              // Paper start - Add UnknownCommandEvent
              final net.kyori.adventure.text.TextComponent.Builder builder = net.kyori.adventure.text.Component.text();
              // source.sendFailure(ComponentUtils.fromMessage(var7.getRawMessage()));
@@ -42,7 +42,7 @@ index d03a6dc74877bc08b170be5add061270dc46549b..76f26f4fb93dd84a9b15ea662eeeadbc
              org.bukkit.Bukkit.getServer().getPluginManager().callEvent(event);
              if (event.message() != null) {
                  source.sendFailure(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.message()), false);
-@@ -677,6 +655,86 @@ public class Commands {
+@@ -676,6 +654,86 @@ public class Commands {
          };
      }
  

leaf-server/paper-patches/features/0004-Purpur-Server-Paper-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Paper Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: dd4143984219cea8440913b7918322b5ba59265a
+Commit: 4b74604c1f9f84e87f91dd390c83850f088a736b
 
 Patches listed below are removed in this patch, They exists in Gale or Leaf:
 * "Rebrand.patch"