remove system property for book size limits

"It was from a different time before books were as jank as they are now. As time has gone on they've only proven to be worse and worse."
2021-06-17 21:12:40 +02:00 · 2021-06-17 21:12:40 +02:00 · 4104545b11
parent 2cbdb174b7
commit 4104545b11
578 changed files with 214 additions and 212 deletions
--- a/patches/server/0135-Add-system-property-to-disable-book-size-limits.patch
+++ b/patches/server/0135-Add-system-property-to-disable-book-size-limits.patch
@ -10,6 +10,8 @@ Disables the security limits on books entirely, allowing plugins AND players
 to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.

+Removed in 1.17: It was from a different time before books were as jank as they are now. As time has gone on they've only proven to be worse and worse.
+
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 index a33dd184ea51df7e59ed08e5e2b0ea4ed9dadff5..1d94d285951faa98ff1f70c3c5330dfaa77cb691 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
--- a/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@ -26,7 +26,7 @@ index c611b5a63498f5ad1f50a75ccd5d7299e27df7e3..9d1cddc6038f0fd0286e4a32013ae98f
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a6891c43b674919eecaac5e826b4d979478b300c..bb58cf52e69258a8c59b595f5fa28ced562965f3 100644
+index 079b3c124308c2711ab76506c856d95e2ac81c3a..98640f6000067b49e1c15740d45dc29e62b7f249 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2057,6 +2057,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
--- a/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
--- a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
@ -19,7 +19,7 @@ Other changes:
    configuration

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3064f56ecb24415be2662aa1bcfbc5facfdb86dc..a3e4d9d5a1829533f1419f9ca124c5209a489938 100644
+index ffb7b25b01bc26e3234358e39633c7f7578e018d..a85b1922391bd9aa121a3654f0095c9523e7fbd7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -21,7 +21,17 @@ repositories {
@ -112,7 +112,7 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 220ead6455587a07375b6e86913865c6b590a87d..d86c5cb6fa9c31db90c6392cd8baf5823b6c32b4 100644
+index 84067073ebb9852fcca0c290b5ca916b099707f1..151d08104ed390905becda5f7ba16c8f933cd3d0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -12,6 +12,7 @@ import com.mojang.datafixers.DataFixer;
@ -278,7 +278,7 @@ index 8bd458b8995c9019b5ae85eab062df44e9424703..79fe58b09c9e0870a5ab55bc21b8ab93
     @Override
     public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6985e8dc3d520eb65ae7d885138be81836452c01..b4bcd34123968b3930bb330f7c2abd9b5518fa31 100644
+index 213ff112be27f02c3742265cea6478a6f8130c99..787db22e4d7df30ccf3d92297fbd2f08ff87beb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -12,7 +12,7 @@ import java.util.logging.Level;
--- a/patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch
--- a/patches/server/0139-Item-canEntityPickup.patch
+++ b/patches/server/0139-Item-canEntityPickup.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup


 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index ac0f2d98a8b2f515696a6e3959b8ff4ff05ba19b..61c9b89b6ef41cde465d84f75f2dc6ef07048cc4 100644
+index 18ea26c8e17da03f35c3fd0788a385cc492ff544..85633cd1718783cffe03f750da1c17270eeb4cdd 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -614,6 +614,11 @@ public abstract class Mob extends LivingEntity {
--- a/patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch
--- a/patches/server/0141-PlayerAttemptPickupItemEvent.patch
+++ b/patches/server/0141-PlayerAttemptPickupItemEvent.patch
--- a/patches/server/0142-Add-UnknownCommandEvent.patch
+++ b/patches/server/0142-Add-UnknownCommandEvent.patch
--- a/patches/server/0143-Basic-PlayerProfile-API.patch
+++ b/patches/server/0143-Basic-PlayerProfile-API.patch
@ -539,7 +539,7 @@ index 2f25e4c26f2f418de738ba2fcf7f2485bb2dda3c..46972308cf399ed02c450bc2d45b4dc8
     // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index b19d50bbe6c944ff66230ac013178bd036a438c8..5e345224e698bd80133dc194385c033369a60a33 100644
+index 9405812b8c308d70de1e26ba55500301b24ecc3c..490df0dcfd0e1e0ab05943410493522f86444ef8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
@@ -80,6 +80,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
--- a/patches/server/0144-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0144-Shoulder-Entities-Release-API.patch
--- a/patches/server/0145-Profile-Lookup-Events.patch
+++ b/patches/server/0145-Profile-Lookup-Events.patch
--- a/patches/server/0146-Block-player-logins-during-server-shutdown.patch
+++ b/patches/server/0146-Block-player-logins-during-server-shutdown.patch
--- a/patches/server/0147-Entity-fromMobSpawner.patch
+++ b/patches/server/0147-Entity-fromMobSpawner.patch
--- a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch
--- a/patches/server/0149-Implement-ensureServerConversions-API.patch
+++ b/patches/server/0149-Implement-ensureServerConversions-API.patch
--- a/patches/server/0150-Implement-getI18NDisplayName.patch
+++ b/patches/server/0150-Implement-getI18NDisplayName.patch
--- a/patches/server/0151-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0151-ProfileWhitelistVerifyEvent.patch
--- a/patches/server/0152-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0152-Fix-this-stupid-bullshit.patch
--- a/patches/server/0153-LivingEntity-setKiller.patch
+++ b/patches/server/0153-LivingEntity-setKiller.patch
--- a/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
--- a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
--- a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
--- a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.

 diff --git a/build.gradle.kts b/build.gradle.kts
-index f82546e7bb2b10b33e45f547ca4eb4e38ebab568..2946f2bd0b12846929c8d708cabe019c2bbf2297 100644
+index a85b1922391bd9aa121a3654f0095c9523e7fbd7..55915452beff1f8b6b9a44cf2a6d208dda6c3d8d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
--- a/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
--- a/patches/server/0159-Add-PlayerJumpEvent.patch
+++ b/patches/server/0159-Add-PlayerJumpEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bb58cf52e69258a8c59b595f5fa28ced562965f3..24f6aeb862c9384ec11132cdf14ca73ee0762e2e 100644
+index 98640f6000067b49e1c15740d45dc29e62b7f249..9255e3d89385fac82a1a2f27bd915cbbd19f69e7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1187,7 +1187,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
--- a/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
+++ b/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 24f6aeb862c9384ec11132cdf14ca73ee0762e2e..f188a55fda95abd5ccf9119ed4ab772841128d74 100644
+index 9255e3d89385fac82a1a2f27bd915cbbd19f69e7..20084d956082d4656f50c4e5e5f2b1c1a9cb9cbc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2781,14 +2781,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
--- a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
@ -90,7 +90,7 @@ index c4ba069f5124ec151e05813beddf293fddc3b804..484221e5a9c246aa91e0eacef3911b0e
 
     @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ea7a937dfd0769d734a056709d3af9d2f2ee5332..7badc90ec9e3b2dfffac6601e432c41224b701f6 100644
+index 08be81ecd34fa2f0289b10179ccc788307a09813..6549ffa087f9955849024fa62cfca9e91cbecf30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -192,6 +192,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0162-revert-serverside-behavior-of-keepalives.patch
@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
 at the cost of dead connections being kept open for longer.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f188a55fda95abd5ccf9119ed4ab772841128d74..c2f614b64482be75b28d47e79b0531a9143a157d 100644
+index 20084d956082d4656f50c4e5e5f2b1c1a9cb9cbc..a679b30076cec74976cd04a7fab737fe88a83329 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -222,9 +222,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
--- a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
--- a/patches/server/0164-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0164-Add-PlayerArmorChangeEvent.patch
--- a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
--- a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
--- a/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.

 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e8ec98aa4598af6733b94a58a196190c9e0839d2..e9e694286bce719b825a37939fe8ab90a5010819 100644
+index f8554943783754618bc04cbbe7df61cebfc98b80..4e7644f875b8ed10cb402e5e1c8b71b4842e0e40 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -140,7 +140,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
--- a/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
--- a/patches/server/0169-AsyncTabCompleteEvent.patch
+++ b/patches/server/0169-AsyncTabCompleteEvent.patch
@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c2f614b64482be75b28d47e79b0531a9143a157d..413bf8504821d4605e940f865332e8dd77acb436 100644
+index a679b30076cec74976cd04a7fab737fe88a83329..92f6f51d3642e1e8bcdb400da87f96ecf20c3218 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -703,10 +703,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
--- a/patches/server/0170-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0170-PlayerPickupExperienceEvent.patch
@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb

 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 9662104a85faff2cdafd8cf001a8222182b56073..4a6a588eeeee3aa7d33d4b4545e9b8bdf043e567 100644
+index cb0194d688ae176e0fba6c48cf59a51ceb1a5c4e..628407ad2f8fd01850dd4f9e25799bcd6a93961d 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
@@ -300,7 +300,7 @@ public class ExperienceOrb extends Entity {
--- a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
--- a/patches/server/0172-Make-max-squid-spawn-height-configurable.patch
+++ b/patches/server/0172-Make-max-squid-spawn-height-configurable.patch
--- a/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world

 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f4f0982aa11da0b5bf88a42c02e86f652f8ea615..dd9cae17aa9ec02e25642a1a45409bec7fb1da91 100644
+index 229e08a3fd8b4fc026ff49af9d163ea26d878bd4..94c5577a887ab4801dae5a1a0accd4b2f448bcc2 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -974,11 +974,21 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@ -36,7 +36,7 @@ index f4f0982aa11da0b5bf88a42c02e86f652f8ea615..dd9cae17aa9ec02e25642a1a45409bec
         });
     }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 8746654a1c1b3b6cb1cabb468c0498aada17d517..bd937505244cc9305611815a9274f91395d3a8f8 100644
+index e3abeb839c36b5238ec115329ce05b58e3383a55..853056ad5c5eeff03e7d6fe0dfd6f837a03ad882 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -632,6 +632,15 @@ public class ServerChunkCache extends ChunkSource {
--- a/patches/server/0174-PreCreatureSpawnEvent.patch
+++ b/patches/server/0174-PreCreatureSpawnEvent.patch
--- a/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
--- a/patches/server/0176-Fill-Profile-Property-Events.patch
+++ b/patches/server/0176-Fill-Profile-Property-Events.patch
--- a/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
--- a/patches/server/0178-Add-ArmorStand-Item-Meta.patch
+++ b/patches/server/0178-Add-ArmorStand-Item-Meta.patch
--- a/patches/server/0179-Extend-Player-Interact-cancellation.patch
+++ b/patches/server/0179-Extend-Player-Interact-cancellation.patch
--- a/patches/server/0180-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/server/0180-Tameable-getOwnerUniqueId-API.patch
--- a/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
--- a/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
--- a/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch
@ -190,7 +190,7 @@ index 67455a5ba75c9b816213e44d6872c5ddf8e27e98..23efad80934930beadf15e65781551d4
 
     public ClientboundStatusResponsePacket(ServerStatus metadata) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d86c5cb6fa9c31db90c6392cd8baf5823b6c32b4..050b27be1c25764d65e5340149718e858b3aeb2e 100644
+index 151d08104ed390905becda5f7ba16c8f933cd3d0..80f8e994d4a85f5d240854ec492adba0633263b2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2,6 +2,9 @@ package net.minecraft.server;
--- a/patches/server/0184-Improved-Async-Task-Scheduler.patch
+++ b/patches/server/0184-Improved-Async-Task-Scheduler.patch
--- a/patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
--- a/patches/server/0186-Player.setPlayerProfile-API.patch
+++ b/patches/server/0186-Player.setPlayerProfile-API.patch
@ -39,7 +39,7 @@ index 278416af649425890ad00ca6f47d459ebab08e0b..91f96f5718f7a7f2e0ce56f4dbf894d8
     private ItemStack lastItemInMainHand;
     private final ItemCooldowns cooldowns;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 44533533c4860a23a0d469c6a544825297d221de..be339681a63db12222a2e5727399f088c053fa4f 100644
+index f1c56823e1e89251c518d9d51ab7442b30a85336..8f7807409a21369bad1515af9c1ebac778924aec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -71,6 +71,7 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper;
--- a/patches/server/0187-getPlayerUniqueId-API.patch
+++ b/patches/server/0187-getPlayerUniqueId-API.patch
--- a/patches/server/0188-Make-player-data-saving-configurable.patch
+++ b/patches/server/0188-Make-player-data-saving-configurable.patch
--- a/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch
--- a/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
--- a/patches/server/0191-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0191-Flag-to-disable-the-channel-limit.patch
@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.

 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index be339681a63db12222a2e5727399f088c053fa4f..8c41ec25ed14ae2541ae3412fb1f4c11e641a32c 100644
+index 8f7807409a21369bad1515af9c1ebac778924aec..60b8d4f974952c131c94c0dd23e44e28135beff9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -149,6 +149,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0192-Add-method-to-open-already-placed-sign.patch
+++ b/patches/server/0192-Add-method-to-open-already-placed-sign.patch
--- a/patches/server/0193-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/server/0193-Configurable-sprint-interruption-on-attack.patch
--- a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 413bf8504821d4605e940f865332e8dd77acb436..3bc5749f0e93b0298fa9a170e53f11dd05730eb1 100644
+index 92f6f51d3642e1e8bcdb400da87f96ecf20c3218..52e51fe26c4c69842ac9d51e747cb10a7aab289f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2787,9 +2787,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
--- a/patches/server/0195-EndermanEscapeEvent.patch
+++ b/patches/server/0195-EndermanEscapeEvent.patch
--- a/patches/server/0196-Enderman.teleportRandomly.patch
+++ b/patches/server/0196-Enderman.teleportRandomly.patch
--- a/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch
--- a/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.

 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 33b156a02b1b051b0cafb55af2804b1f3f4b4434..c29092954b0ea79184972d266d22570b343a9d70 100644
+index 960471d86a599ca20aaede2e0ae07f7428b7ec4f..894e828280d6ccc175cffd8813602b3406c8e95a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1287,12 +1287,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
--- a/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
--- a/patches/server/0200-EndermanAttackPlayerEvent.patch
+++ b/patches/server/0200-EndermanAttackPlayerEvent.patch
--- a/patches/server/0201-WitchConsumePotionEvent.patch
+++ b/patches/server/0201-WitchConsumePotionEvent.patch
--- a/patches/server/0202-WitchThrowPotionEvent.patch
+++ b/patches/server/0202-WitchThrowPotionEvent.patch
--- a/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
--- a/patches/server/0204-WitchReadyPotionEvent.patch
+++ b/patches/server/0204-WitchReadyPotionEvent.patch
--- a/patches/server/0205-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/server/0205-ItemStack-getMaxItemUseDuration.patch
--- a/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
--- a/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
--- a/patches/server/0208-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0208-Fix-CraftEntity-hashCode.patch
--- a/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
--- a/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
--- a/patches/server/0211-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0211-Make-shield-blocking-delay-configurable.patch
--- a/patches/server/0212-Improve-EntityShootBowEvent.patch
+++ b/patches/server/0212-Improve-EntityShootBowEvent.patch
--- a/patches/server/0213-PlayerReadyArrowEvent.patch
+++ b/patches/server/0213-PlayerReadyArrowEvent.patch
--- a/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
@ -56,7 +56,7 @@ index 08c29388621bf460e1704f6edba59d08a12e75d0..7bb2ce6b378547d593f8487626b5a4d4
     }
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 61c9b89b6ef41cde465d84f75f2dc6ef07048cc4..9c208d24d6f84e8818c0a7b88cdcb7c2fd703f91 100644
+index 85633cd1718783cffe03f750da1c17270eeb4cdd..5595150b0da580fce4d5d23993d77314e225ad58 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1532,7 +1532,7 @@ public abstract class Mob extends LivingEntity {
--- a/patches/server/0215-Expand-Explosions-API.patch
+++ b/patches/server/0215-Expand-Explosions-API.patch
--- a/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
--- a/patches/server/0217-RangedEntity-API.patch
+++ b/patches/server/0217-RangedEntity-API.patch
--- a/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
--- a/patches/server/0219-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0219-Implement-World.getEntity-UUID-API.patch
--- a/patches/server/0220-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0220-InventoryCloseEvent-Reason-API.patch
@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.

 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c29092954b0ea79184972d266d22570b343a9d70..ab5059b5cdbcb8e4d47d21d2883c0cd52fc00cf7 100644
+index 894e828280d6ccc175cffd8813602b3406c8e95a..0f45f6022a4dc9638032278cce0f8d6fc431bd56 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1055,7 +1055,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@ -84,7 +84,7 @@ index 83a2c8e00d8445ad66bb8360f4e0e4b7cba44bb3..b9fdccfc9815b0aec7bb5f5ad633c69b
         this.doCloseContainer();
     }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3bc5749f0e93b0298fa9a170e53f11dd05730eb1..f9f1eb0d7e85278186f42a4975d113bf07f367e9 100644
+index 52e51fe26c4c69842ac9d51e747cb10a7aab289f..832233eea019b9a10b182ef1a2a072ece4b88ee4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -188,6 +188,7 @@ import org.bukkit.event.inventory.ClickType;
@ -185,7 +185,7 @@ index c839ea0b68fbdccfb7ed667c705a3f0f347fd89c..43cee8b0b2b94d6db6303a1631731ed5
     @Override
     public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8c41ec25ed14ae2541ae3412fb1f4c11e641a32c..b810ea97165d4a5e1f93cc6ca64c9bdbce740313 100644
+index 60b8d4f974952c131c94c0dd23e44e28135beff9..1800119160d5711b694c14e9dde175b11c06ce61 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -921,7 +921,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0221-Vex-get-setSummoner-API.patch
+++ b/patches/server/0221-Vex-get-setSummoner-API.patch
--- a/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f9f1eb0d7e85278186f42a4975d113bf07f367e9..4526bf94a9fd39c2f139666557f389a8684595a2 100644
+index 832233eea019b9a10b182ef1a2a072ece4b88ee4..f8787bda0652affef90300e334200c34db6b1675 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2218,6 +2218,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
--- a/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
--- a/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch
+++ b/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2946f2bd0b12846929c8d708cabe019c2bbf2297..bac1ed67b41fd0f63a1e4f511d62144791360550 100644
+index 55915452beff1f8b6b9a44cf2a6d208dda6c3d8d..ff26c51fe2a04bd8a18a9c4ee9ca004f32fae4ab 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -42,6 +42,7 @@ dependencies {
--- a/patches/server/0225-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0225-add-more-information-to-Entity.toString.patch
@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 609bffc7d8f21c8733b3fb861fe02f9d1302d796..fc12ee50c275705b7ca33f7f1f2578d0857b47f0 100644
+index f3b5df4e693d923796929b79f9a43bfa4cbe03e7..a6ba0c7fe05aae72b98072aaa008a1346bf2704e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2805,7 +2805,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
--- a/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
--- a/patches/server/0227-EnderDragon-Events.patch
+++ b/patches/server/0227-EnderDragon-Events.patch
--- a/patches/server/0228-PlayerElytraBoostEvent.patch
+++ b/patches/server/0228-PlayerElytraBoostEvent.patch
--- a/patches/server/0229-PlayerLaunchProjectileEvent.patch
+++ b/patches/server/0229-PlayerLaunchProjectileEvent.patch
--- a/patches/server/0230-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0230-Improve-BlockPosition-inlining.patch
--- a/patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch
+++ b/patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch
--- a/patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@ -31,7 +31,7 @@ index 6d717d3852afb3a3a4bef30c68980c402bdfefff..b47b1215e685c453c3496439bb350a91
 
         for (int i = 0; i < list.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e9e694286bce719b825a37939fe8ab90a5010819..ed7b9b350558df96f91b64ceccb137968c05a0f6 100644
+index 4e7644f875b8ed10cb402e5e1c8b71b4842e0e40..2d13cbfb5e4ea359106fc008f203b104a179b9c0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -769,6 +769,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
--- a/patches/server/0233-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0233-Vanished-players-don-t-have-rights.patch
@ -38,7 +38,7 @@ index 86d245c9a817be5fd2be7f331d3a3a5f3169e8c2..44b28773fe8e79931e738d493bd9405e
 
         BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ed7b9b350558df96f91b64ceccb137968c05a0f6..4635400065ef169d7c95e083c2b57eb0dd7f29ce 100644
+index 2d13cbfb5e4ea359106fc008f203b104a179b9c0..f820232e037fa05f7d666fddac6ad1b8b18b04e0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -71,6 +71,10 @@ import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
--- a/Show More
+++ b/Show More