More more more work

patches/unapplied/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch → patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection
 Offers a gameplay feature to stop cats from blocking chests
 
 diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index e89be04aed49723aca35c7b17b2a623eac0587e0..af6e245b02d5fb78764d2db0ac200056277b212a 100644
+index 3d153e5c48bc80ec969de9a32113537e03fb812b..9804ee2020e5cef23d3f5174d153fc149e611503 100644
 --- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-@@ -361,6 +361,11 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
+@@ -364,6 +364,11 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
      }
 
      private static boolean isCatSittingOnChest(LevelAccessor world, BlockPos pos) {

patches/unapplied/server/0052-Improve-Player-chat-API-handling.patch → patches/server/0052-Improve-Player-chat-API-handling.patch

@@ -17,10 +17,10 @@ Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 70fe4e973f41c2e5b12c0d96be418dd40e69c0f2..adef64b955170dc00c75c06bf0f41a09b2516520 100644
+index b41351783ea9795afaddce453c82ab32cb8134a1..870a1d6679fa062d90bcfa1a21a8af0cf67f2950 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1926,7 +1926,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1934,7 +1934,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
          OutgoingChatMessage outgoing = OutgoingChatMessage.create(original);
 
@@ -29,7 +29,7 @@ index 70fe4e973f41c2e5b12c0d96be418dd40e69c0f2..adef64b955170dc00c75c06bf0f41a09
              this.handleCommand(s);
          } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
              // Do nothing, this is coming from a plugin
-@@ -2010,7 +2010,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2018,7 +2018,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
      }
 
@@ -40,10 +40,10 @@ index 70fe4e973f41c2e5b12c0d96be418dd40e69c0f2..adef64b955170dc00c75c06bf0f41a09
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6f66f8514170e5686ed9410d1c755eeef5b61f8a..56fb2dfc920bde3554706fa218913af448a99fd9 100644
+index 7102165a09afdf6f33257f9fcd6c2c96aefd566a..21f7a4d8ad251468b78399df04587991e3df3a65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -889,7 +889,7 @@ public final class CraftServer implements Server {
+@@ -884,7 +884,7 @@ public final class CraftServer implements Server {
      public boolean dispatchCommand(CommandSender sender, String commandLine) {
          Preconditions.checkArgument(sender != null, "sender cannot be null");
          Preconditions.checkArgument(commandLine != null, "commandLine cannot be null");
@@ -53,10 +53,10 @@ index 6f66f8514170e5686ed9410d1c755eeef5b61f8a..56fb2dfc920bde3554706fa218913af4
          if (this.commandMap.dispatch(sender, commandLine)) {
              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 d0448d310fde607a006acf37e86cd3eede93a2ba..4c4219ffe5c172d263106f522ea3ec7ba0d7dfad 100644
+index 1e395d14382c79231dc81d6cf7ea864e45906add..445e1349256a788a59831893ba7238ae95ae6bef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -494,7 +494,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -501,7 +501,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
          if (this.getHandle().connection == null) return;
 

patches/unapplied/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch → patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] All chunks are slime spawn chunks toggle
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 2e343d108714bd136ab8e7b20acbf241166177de..382cdfd7d7dceeeffed1cdc34b9e475a69b5c76b 100644
+index 8b2206c5c56341ecd96837bdb3e0c6ab7c874af5..ef382b08ff8e7f24500aed6752c76e6ffc3f0729 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-@@ -331,7 +331,7 @@ public class Slime extends Mob implements Enemy {
-             }
+@@ -338,7 +338,7 @@ public class Slime extends Mob implements Enemy {
+                 }
 
-             ChunkPos chunkcoordintpair = new ChunkPos(pos);
--            boolean flag = WorldgenRandom.seedSlimeChunk(chunkcoordintpair.x, chunkcoordintpair.z, ((WorldGenLevel) world).getSeed(), world.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot
+                 ChunkPos chunkcoordintpair = new ChunkPos(pos);
+-                boolean flag = WorldgenRandom.seedSlimeChunk(chunkcoordintpair.x, chunkcoordintpair.z, ((WorldGenLevel) world).getSeed(), world.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot
 +            boolean flag = world.getMinecraftWorld().paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(chunkcoordintpair.x, chunkcoordintpair.z, ((WorldGenLevel) world).getSeed(), world.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper
 
-             if (random.nextInt(10) == 0 && flag && pos.getY() < 40) {
-                 return checkMobSpawnRules(type, world, spawnReason, pos, random);
+                 if (random.nextInt(10) == 0 && flag && pos.getY() < 40) {
+                     return checkMobSpawnRules(type, world, spawnReason, pos, random);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 index 7687a81bfa420e8377308fea3d6738141bc945d3..df02963faaf8f514f4175d394e67d2df10c8a3ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java

patches/unapplied/server/0054-Expose-server-CommandMap.patch → patches/server/0054-Expose-server-CommandMap.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 56fb2dfc920bde3554706fa218913af448a99fd9..b1779442254a582f2563e99bb50e47ba9d98b1d8 100644
+index 21f7a4d8ad251468b78399df04587991e3df3a65..0ef715796926076042705d48a20b80c4b4b29466 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2080,6 +2080,7 @@ public final class CraftServer implements Server {
+@@ -2112,6 +2112,7 @@ public final class CraftServer implements Server {
          return this.helpMap;
      }
 

patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch → patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8d7124a9efce888ccfbef320a90c750f6009f551..aaf8ad36078554aa2783874f395da0997f6af92c 100644
+index 0ecfcf1b3a7a7ccdbb0d55f1b1e57feee4e724c3..bde3486b5eb89f8e35778eb59a44c7208ae38743 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -102,7 +102,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -103,7 +103,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      @Override
      public void setHealth(double health) {
          health = (float) health;

patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch → patches/server/0056-Player-Tab-List-and-Title-APIs.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index 7720470396d3ade926c4c75c5fab5a3f435b0033..9c211b0db837b16d50aee63d0caf45e1a12bcc83 100644
+index bc7d0cc8d66f07b45cffd9952829cc9bed9ce260..00beadec2ad995d724758d051457a3d780d9d813 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 @@ -532,6 +532,11 @@ public class FriendlyByteBuf extends ByteBuf {
-     public FriendlyByteBuf writeComponent(final net.kyori.adventure.text.Component component) {
-         return this.writeUtf(io.papermc.paper.adventure.PaperAdventure.asJsonString(component, this.adventure$locale), 262144);
+         // TODO this.adventure$locale
+         return this.writeWithCodec(NbtOps.INSTANCE, ComponentSerialization.CODEC, io.papermc.paper.adventure.PaperAdventure.asVanilla(component));
      }
 +
 +    @Deprecated
@@ -21,7 +21,7 @@ index 7720470396d3ade926c4c75c5fab5a3f435b0033..9c211b0db837b16d50aee63d0caf45e1
 
      public FriendlyByteBuf writeComponent(Component text) {
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java
-index c44a276d201fdfa5144d45d319d7761583c60639..f68a1a6dc6add9496e25cb52c318e086e356e2bb 100644
+index e77bd5bb66279f579fad4fdcc8b0606410922e9e..4c05fee93eb20044a4198c43d5ae1eebebaabaf7 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java
 @@ -7,6 +7,7 @@ import net.minecraft.network.protocol.Packet;
@@ -42,7 +42,7 @@ index c44a276d201fdfa5144d45d319d7761583c60639..f68a1a6dc6add9496e25cb52c318e086
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java
-index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a43420b437 100644
+index 7bb08db97c324d13836303cc8a4623c71d6c8a2c..5e9045f7722481e1f83a3d36d7b3d86e9f45d5b1 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java
 @@ -7,6 +7,7 @@ import net.minecraft.network.protocol.Packet;
@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4c4219ffe5c172d263106f522ea3ec7ba0d7dfad..ab8b584eb1c98d10caeb7d9581f826b4ae984c7c 100644
+index 445e1349256a788a59831893ba7238ae95ae6bef..136dd30ae472a58845a2d8f399d2040faed09345 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -73,7 +73,7 @@ index 4c4219ffe5c172d263106f522ea3ec7ba0d7dfad..ab8b584eb1c98d10caeb7d9581f826b4
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -336,6 +337,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -343,6 +344,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
 

patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch → patches/server/0057-Add-configurable-portal-search-radius.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5d5cdcc3d6ba9b76b083404beb532eecf3f83f50..0d24d283ce035ab89136f4fc49a0ae08d90fd268 100644
+index 450a55fd1b01ac67d911d152a04a3dee3aa0a2e9..6fe0883a6746a31acff7ede501e058b68ad6e78d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3200,7 +3200,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3233,7 +3233,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  double d0 = DimensionType.getTeleportationScale(this.level().dimensionType(), destination.dimensionType());
                  BlockPos blockposition = worldborder.clampToBounds(this.getX() * d0, this.getY(), this.getZ() * d0);
                  // CraftBukkit start

patches/unapplied/server/0058-Add-velocity-warnings.patch → patches/server/0058-Add-velocity-warnings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b1779442254a582f2563e99bb50e47ba9d98b1d8..3771ac5c7663bbd2cc2c4c1acfe8fd8848713ce8 100644
+index 0ef715796926076042705d48a20b80c4b4b29466..8fbd8d021fe638505dc70188779f6b92ef2696cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -302,6 +302,7 @@ public final class CraftServer implements Server {
+@@ -303,6 +303,7 @@ public final class CraftServer implements Server {
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
      public int reloadCount;
@@ -17,10 +17,10 @@ index b1779442254a582f2563e99bb50e47ba9d98b1d8..3771ac5c7663bbd2cc2c4c1acfe8fd88
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 402b6e5d6428c5a34d722888670f94c7fbe34fe4..68d00a158751d24c7f0e38920d78c0547f1928eb 100644
+index beae7b8cf726f61b25c5afb553da8c34dce1dd37..6100b2e718954b40f63ed30ab32e1dea4edba9a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -470,10 +470,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -477,10 +477,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public void setVelocity(Vector velocity) {
          Preconditions.checkArgument(velocity != null, "velocity");
          velocity.checkFinite();

patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch → patches/server/0059-Configurable-inter-world-teleportation-safety.patch

@@ -16,10 +16,10 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ab8b584eb1c98d10caeb7d9581f826b4ae984c7c..c87cba2252f091b026c9169ebf1117cd82d7942b 100644
+index 136dd30ae472a58845a2d8f399d2040faed09345..a58b0d10d73310587a05e40e072029ee258063e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1164,7 +1164,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1171,7 +1171,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entity.connection.teleport(to);
          } else {
              // The respawn reason should never be used if the passed location is non null.

patches/unapplied/server/0060-Add-exception-reporting-event.patch → patches/server/0060-Add-exception-reporting-event.patch

@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..f699ce18ca044f813e194ef2786b7ea8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-index 0650b1eee2ae8caa5268f4df82f740440ce16fdf..0214830d9bc98b8d435ff11f40df65596980cf77 100644
+index 8d06e8d286da2573e40794adab695ff77e5afd86..78b11d6fd74fb0714a8013fdc78d096643c4f83c 100644
 --- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
 +++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
 @@ -1,5 +1,6 @@
@@ -59,15 +59,15 @@ index 0650b1eee2ae8caa5268f4df82f740440ce16fdf..0214830d9bc98b8d435ff11f40df6559
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.io.Files;
-@@ -358,6 +359,7 @@ public class OldUsersConverter {
-                             root = NbtIo.readCompressed(new java.io.FileInputStream(file5));
+@@ -357,6 +358,7 @@ public class OldUsersConverter {
+                             root = NbtIo.readCompressed(new java.io.FileInputStream(file5), NbtAccounter.unlimitedHeap());
                          } catch (Exception exception) {
                              exception.printStackTrace();
 +                            ServerInternalException.reportInternalException(exception); // Paper
                          }
 
                          if (root != null) {
-@@ -371,6 +373,7 @@ public class OldUsersConverter {
+@@ -370,6 +372,7 @@ public class OldUsersConverter {
                                  NbtIo.writeCompressed(root, new java.io.FileOutputStream(file2));
                              } catch (Exception exception) {
                                  exception.printStackTrace();
@@ -88,7 +88,7 @@ index c6fb4c33d7ea52b88d8fc0d90748cbab7387c565..fed09b886f4fa0006d160e5f2abb00df
              }
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c2dd635cba209962d24b43fbf0ee0e9d9e82fee0..f7c69de5227a9b3fc409374d715aaecdf6330e70 100644
+index ac169632113c3d2177910723ce920cd9a4f7af66..5c42b38ab337a3fd4e4b4ac8d0aa2db43540446c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1,5 +1,10 @@
@@ -102,7 +102,7 @@ index c2dd635cba209962d24b43fbf0ee0e9d9e82fee0..f7c69de5227a9b3fc409374d715aaecd
  import com.google.common.collect.Lists;
  import com.mojang.serialization.Codec;
  import java.io.IOException;
-@@ -730,6 +735,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -741,6 +746,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper start - Prevent tile entity and entity crashes
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);