Updated Upstream (Pufferfish)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.19.3-R0.1-SNAPSHOT
 
-PufferfishCommit = 053386aab6e1a14967eef84b3373d71576e61309
+PufferfishCommit = 8d7c300cf2b8a46ee6849716147401c5a1f10dbd
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0009-Purpur-Implement-TPSBar.patch

@@ -141,7 +141,7 @@ index 7d6d3c8556033d289fdadc489e73fba478fce41a..d4ae8fc06ac5931273e6ced45158d8a3
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c0b599b1835d28ddda3690b29f29bd8c6f03e215..8717915fdcfcf7220847a1391863a7a81f7d4738 100644
+index 4b754f6eae683248d7fe11d6d6cb168d5dd696a2..866042589daa1d3e85645293375bd1dfc34c1982 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -100,6 +100,7 @@ import net.minecraft.world.scores.Objective;
@@ -152,7 +152,7 @@ index c0b599b1835d28ddda3690b29f29bd8c6f03e215..8717915fdcfcf7220847a1391863a7a8
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -449,6 +450,7 @@ public abstract class PlayerList {
+@@ -455,6 +456,7 @@ public abstract class PlayerList {
              scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
          }
          // Paper end
@@ -160,7 +160,7 @@ index c0b599b1835d28ddda3690b29f29bd8c6f03e215..8717915fdcfcf7220847a1391863a7a8
          // CraftBukkit - Moved from above, added world
          PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
      }
-@@ -558,6 +560,8 @@ public abstract class PlayerList {
+@@ -564,6 +566,8 @@ public abstract class PlayerList {
      }
      public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
          // Paper end

patches/server/0017-Purpur-Configurable-broadcast-settings.patch

@@ -58,10 +58,10 @@ index cdcd1358ab8781c261c97aec03bb96118eb577f7..d46f33d9bc99484297270f88e68c1519
      public void displayClientMessage(Component message, boolean overlay) {
          this.sendSystemMessage(message, overlay);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8717915fdcfcf7220847a1391863a7a81f7d4738..5f9a70be89131624021e7b1623b54bf22ae6d19e 100644
+index 866042589daa1d3e85645293375bd1dfc34c1982..d63a020733e1274d9cc87df13b4b50d36b006629 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1011,6 +1011,20 @@ public abstract class PlayerList {
+@@ -1017,6 +1017,20 @@ public abstract class PlayerList {
      }
      // CraftBukkit end
  
@@ -103,7 +103,7 @@ index 2848cb7c76e94d8349f042dc92daf01322a6ce5a..0edf0e24b0b311269b447a34f3aad485
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6a9c0f0b4b749c5907a274d6a83254284d8763bb..3961f66a23508089df8c4ee7455e170cb870e9d0 100644
+index 3073b34a0e0281b6b0330721bb0440147de28511..ebc7034d68a1c732ba5b89c95e79660d5505a74c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3863,6 +3863,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0018-Purpur-Allow-player-join-full-server-by-permission.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5f9a70be89131624021e7b1623b54bf22ae6d19e..55418d3e366bca06b917ed977cb4f2b99a6c7250 100644
+index d63a020733e1274d9cc87df13b4b50d36b006629..e1a60b9e380448e1594516ec078e89cc7f74db2a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -715,7 +715,7 @@ public abstract class PlayerList {
+@@ -721,7 +721,7 @@ public abstract class PlayerList {
              event.disallow(PlayerLoginEvent.Result.KICK_BANNED, PaperAdventure.asAdventure(ichatmutablecomponent)); // Paper - Adventure
          } else {
              // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? IChatBaseComponent.translatable("multiplayer.disconnect.server_full") : null;

patches/server/0028-Purpur-Remove-Timings.patch

@@ -658,7 +658,7 @@ index 53198ebfa30273c5ddc1bb4324f5174ff99f688d..deef2fafed137d90cbd14a71d3e7bb12
  
          } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f6e237b473ee2fe99cf7ab1156020fda14a50a9d..7c46fe2aae0b13b860ca48f5af33d5c6432b3275 100644
+index a03e963a5019a5cc1199e50dc4cac34212b34621..7a8d3a5660700a95f508ea1f43e5a262d2dbf8cc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2522,7 +2522,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -689,10 +689,10 @@ index f6e237b473ee2fe99cf7ab1156020fda14a50a9d..7c46fe2aae0b13b860ca48f5af33d5c6
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f736819067f04f1ac23dc952e9e88ac7c6ef89a5..eae00a4ae4731c2aafea66f925bfdac1748ec008 100644
+index e1a60b9e380448e1594516ec078e89cc7f74db2a..c0278a87a77d14c7598e6d431b63bbd5c7d863af 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1197,7 +1197,7 @@ public abstract class PlayerList {
+@@ -1203,7 +1203,7 @@ public abstract class PlayerList {
  
      public void saveAll(int interval) {
          io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -701,7 +701,7 @@ index f736819067f04f1ac23dc952e9e88ac7c6ef89a5..eae00a4ae4731c2aafea66f925bfdac1
          int numSaved = 0;
          long now = MinecraftServer.currentTick;
          for (int i = 0; i < this.players.size(); ++i) {
-@@ -1208,7 +1208,7 @@ public abstract class PlayerList {
+@@ -1214,7 +1214,7 @@ public abstract class PlayerList {
              }
              // Paper end
          }
@@ -931,7 +931,7 @@ index 138407c2d4b0bc55ddb9aac5d2aa3edadda090fb..a6e9e503a496c18e2501b03ec84f4600
          // Paper end - add timings for scoreboard search
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 76b0e05d448208a50a62c0b5e029430da34faf32..6139727ae25066af70bb65217e184cc64de94e2b 100644
+index 63d3fcc45be732a4cd2dc8b5347d860fd6577bdd..57a27fb05235db8c056492885055fdbe36bee7d1 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -169,7 +169,7 @@ public class ActivationRange