diff --git a/patches/unapplied/server/0536-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0536-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/unapplied/server/0536-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0536-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/unapplied/server/0537-Player-Chunk-Load-Unload-Events.patch b/patches/server/0537-Player-Chunk-Load-Unload-Events.patch similarity index 90% rename from patches/unapplied/server/0537-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0537-Player-Chunk-Load-Unload-Events.patch index f4e0c3d78..fcd60beef 100644 --- a/patches/unapplied/server/0537-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0537-Player-Chunk-Load-Unload-Events.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c9bb90854af9881f044c1968d116368957cc1d7d..8f28a0785b862f608c11dd8dbe585a8a8419bce9 100644 +index 8c6f55efb555c9ca7253ccc1cd9ba615cfb1171c..345091d6ba617c26ac7acfd88eb023f2ec8fae11 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2140,11 +2140,21 @@ public class ServerPlayer extends Player { +@@ -2129,11 +2129,21 @@ public class ServerPlayer extends Player { public void trackChunk(ChunkPos chunkPos, Packet chunkDataPacket) { this.connection.send(chunkDataPacket); diff --git a/patches/unapplied/server/0538-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/unapplied/server/0538-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/unapplied/server/0539-Expose-LivingEntity-hurt-direction.patch b/patches/server/0539-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/unapplied/server/0539-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0539-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/unapplied/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/unapplied/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/unapplied/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/unapplied/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/unapplied/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 99% rename from patches/unapplied/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch index e02f2667c..339a34391 100644 --- a/patches/unapplied/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch +++ b/patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch @@ -37,7 +37,7 @@ index 0c585354ba459ceb6badbf60dcf7b068bfa108b6..5eab7d50734551d96128dfebee126a1d CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult()); } diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -index 36d42b2a97168dfa525b55d8fa2f7a603b43340f..f1438e527d6291a789d2ec821481f6ec142d1c0b 100644 +index 66261330157cef50dfabb7f92e9ece6dcd280951..823ead0fd1942db0219968cd383439b324b16f6e 100644 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java @@ -751,6 +751,14 @@ public abstract class AbstractContainerMenu { diff --git a/patches/unapplied/server/0543-Implement-TargetHitEvent.patch b/patches/server/0543-Implement-TargetHitEvent.patch similarity index 100% rename from patches/unapplied/server/0543-Implement-TargetHitEvent.patch rename to patches/server/0543-Implement-TargetHitEvent.patch diff --git a/patches/unapplied/server/0544-MC-4-Fix-item-position-desync.patch b/patches/server/0544-MC-4-Fix-item-position-desync.patch similarity index 93% rename from patches/unapplied/server/0544-MC-4-Fix-item-position-desync.patch rename to patches/server/0544-MC-4-Fix-item-position-desync.patch index 2efd15bac..4172d387c 100644 --- a/patches/unapplied/server/0544-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0544-MC-4-Fix-item-position-desync.patch @@ -27,10 +27,10 @@ index 3768a71491ef7836b9739bdaec7a077c523dbacd..a57957ace1a72b3308487f180a366c38 public Vec3 decode(long x, long y, long z) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 933b49da673c07e45f6cb5727598df492cf1a958..c665ecbff7d2b4626eb07aace543448e2278a2da 100644 +index 11a5a0b3002300b882511b4ebafe96af5e230cb8..81c70cf84618f4e987c68dba081317a658c6cd91 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3893,6 +3893,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3890,6 +3890,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) { // Paper end diff --git a/patches/unapplied/server/0545-Additional-Block-Material-API-s.patch b/patches/server/0545-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/unapplied/server/0545-Additional-Block-Material-API-s.patch rename to patches/server/0545-Additional-Block-Material-API-s.patch diff --git a/patches/unapplied/server/0546-Fix-harming-potion-dupe.patch b/patches/server/0546-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/unapplied/server/0546-Fix-harming-potion-dupe.patch rename to patches/server/0546-Fix-harming-potion-dupe.patch diff --git a/patches/unapplied/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/unapplied/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/unapplied/server/0548-Cache-burn-durations.patch b/patches/server/0548-Cache-burn-durations.patch similarity index 100% rename from patches/unapplied/server/0548-Cache-burn-durations.patch rename to patches/server/0548-Cache-burn-durations.patch diff --git a/patches/unapplied/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/unapplied/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/unapplied/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/unapplied/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/unapplied/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/unapplied/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/unapplied/server/0552-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch similarity index 85% rename from patches/unapplied/server/0552-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch index 51eaaaca6..62192345e 100644 --- a/patches/unapplied/server/0552-Fix-interact-event-not-being-called-in-adventure.patch +++ b/patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch @@ -6,19 +6,19 @@ Subject: [PATCH] Fix interact event not being called in adventure Call PlayerInteractEvent when left-clicking on a block in adventure mode diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8254c6d3bcff79c9a718c89f8c04c2c2db035a8f..0f7be5c33fbc5e762cf64f9cc0cd8dc502751360 100644 +index 04bd217574e4395f3a42511d7e8b1938f5106cec..75b8e92c1fb57c3062ce30e0d00396e4a69ec3c0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1779,7 +1779,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -1845,7 +1845,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic MutableComponent ichatmutablecomponent = Component.translatable("build.tooHigh", i - 1).withStyle(ChatFormatting.RED); - this.player.sendSystemMessage(ichatmutablecomponent, ChatType.GAME_INFO); + this.player.sendSystemMessage(ichatmutablecomponent, true); - } else if (enuminteractionresult.shouldSwing()) { + } else if (enuminteractionresult.shouldSwing() && !this.player.gameMode.interactResult) { // Paper this.player.swing(enumhand, true); } } -@@ -2412,7 +2412,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -2592,7 +2592,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic Vec3 vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3); HitResult movingobjectposition = this.player.level.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.player)); diff --git a/patches/unapplied/server/0553-Zombie-API-breaking-doors.patch b/patches/server/0553-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/unapplied/server/0553-Zombie-API-breaking-doors.patch rename to patches/server/0553-Zombie-API-breaking-doors.patch diff --git a/patches/unapplied/server/0554-Fix-nerfed-slime-when-splitting.patch b/patches/server/0554-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/unapplied/server/0554-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0554-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/unapplied/server/0555-Add-EntityLoadCrossbowEvent.patch b/patches/server/0555-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/unapplied/server/0555-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0555-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/unapplied/server/0556-Guardian-beam-workaround.patch b/patches/server/0556-Guardian-beam-workaround.patch similarity index 100% rename from patches/unapplied/server/0556-Guardian-beam-workaround.patch rename to patches/server/0556-Guardian-beam-workaround.patch diff --git a/patches/unapplied/server/0557-Added-WorldGameRuleChangeEvent.patch b/patches/server/0557-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/unapplied/server/0557-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0557-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/unapplied/server/0558-Added-ServerResourcesReloadedEvent.patch b/patches/server/0558-Added-ServerResourcesReloadedEvent.patch similarity index 97% rename from patches/unapplied/server/0558-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0558-Added-ServerResourcesReloadedEvent.patch index d7d3a17b4..447484eb5 100644 --- a/patches/unapplied/server/0558-Added-ServerResourcesReloadedEvent.patch +++ b/patches/server/0558-Added-ServerResourcesReloadedEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 115e598dcb075a8019b588b878e9d22994f0ce9f..7b6828a1d93715d39107964ae2a809d6508414ed 100644 +index 6fd6d2a4faf8e72511170fb3c3aa80733ed0e8d9..04be281c3862707055b143267186169205720ab2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1977,7 +1977,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { this.getServer().execute(() -> { diff --git a/patches/unapplied/server/0567-Fix-villager-boat-exploit.patch b/patches/server/0567-Fix-villager-boat-exploit.patch similarity index 88% rename from patches/unapplied/server/0567-Fix-villager-boat-exploit.patch rename to patches/server/0567-Fix-villager-boat-exploit.patch index 41111aa03..07d1f498f 100644 --- a/patches/unapplied/server/0567-Fix-villager-boat-exploit.patch +++ b/patches/server/0567-Fix-villager-boat-exploit.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix villager boat exploit diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 75c713f7afd8c4fd5fffada7397b102751eb6423..6c7105af36339514db02800e651cd0948d48bdaf 100644 +index e18c38132536e9d671376f7bf1a75941063a5136..8d30690cc603cbdfc2befeb6e1f6abde301bb1d7 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -625,6 +625,14 @@ public abstract class PlayerList { +@@ -629,6 +629,14 @@ public abstract class PlayerList { PlayerList.LOGGER.debug("Removing player mount"); entityplayer.stopRiding(); entity.getPassengersAndSelf().forEach((entity1) -> { diff --git a/patches/unapplied/server/0568-Add-sendOpLevel-API.patch b/patches/server/0568-Add-sendOpLevel-API.patch similarity index 86% rename from patches/unapplied/server/0568-Add-sendOpLevel-API.patch rename to patches/server/0568-Add-sendOpLevel-API.patch index def544bb3..2c6a83700 100644 --- a/patches/unapplied/server/0568-Add-sendOpLevel-API.patch +++ b/patches/server/0568-Add-sendOpLevel-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 6c7105af36339514db02800e651cd0948d48bdaf..42b2f5c61e2bd07c3c86d889949c5f24345680d6 100644 +index 8d30690cc603cbdfc2befeb6e1f6abde301bb1d7..78629b9e09d8326780f6f4e92340db7d92a5092b 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1123,6 +1123,11 @@ public abstract class PlayerList { +@@ -1127,6 +1127,11 @@ public abstract class PlayerList { } private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) { @@ -20,7 +20,7 @@ index 6c7105af36339514db02800e651cd0948d48bdaf..42b2f5c61e2bd07c3c86d889949c5f24 if (player.connection != null) { byte b0; -@@ -1137,8 +1142,10 @@ public abstract class PlayerList { +@@ -1141,8 +1146,10 @@ public abstract class PlayerList { player.connection.send(new ClientboundEntityEventPacket(player, b0)); } @@ -32,7 +32,7 @@ index 6c7105af36339514db02800e651cd0948d48bdaf..42b2f5c61e2bd07c3c86d889949c5f24 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 39e0f1398e6f09ce7b0a4f1c9b677dca10a32c3f..202c5108f2e15e0d71c4e2854b17a027c7e495af 100644 +index ced1fd7ac0cbc80d5d65c95163ee271b26281773..e3ea73cc055a0738bc575f7f523bd61ff050e171 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -606,6 +606,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0569-Add-PaperRegistry.patch b/patches/server/0569-Add-PaperRegistry.patch similarity index 98% rename from patches/unapplied/server/0569-Add-PaperRegistry.patch rename to patches/server/0569-Add-PaperRegistry.patch index 8e7d64bb0..0af9cdf79 100644 --- a/patches/unapplied/server/0569-Add-PaperRegistry.patch +++ b/patches/server/0569-Add-PaperRegistry.patch @@ -193,7 +193,7 @@ index 0000000000000000000000000000000000000000..6f39e343147803e15e7681c993b8797a +public record RegistryKey(Class apiClass, ResourceKey> resourceKey) { +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7b6828a1d93715d39107964ae2a809d6508414ed..70464c6d858132dd21e0ec70154e66c1285a4940 100644 +index 04be281c3862707055b143267186169205720ab2..ea98c98e4449451895c6d91481ace6908c206f45 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2009,6 +2009,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 853929fb1ae428baf9f7cd3f49fdadd52e0c3401..ca2e1f7735352ece4a05a21539e5606b16322322 100644 +index bfabed84ef3bb61274ed60f54ae93b41eae8d228..b4d3bff060874871e3aebba1ba3570c8418a52bd 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -216,6 +216,7 @@ public class ServerLevel extends Level implements WorldGenLevel { public final LevelStorageSource.LevelStorageAccess convertable; public final UUID uuid; public boolean hasPhysicsEvent = true; // Paper @@ -29,10 +29,10 @@ index 853929fb1ae428baf9f7cd3f49fdadd52e0c3401..ca2e1f7735352ece4a05a21539e5606b return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9310770edd38107211dafb94529d0edc73889e85..20816ccecd427ca747719dea5fd6c2d5544b71ff 100644 +index 502d54845e1bcf538149a51be995320c6df10acb..ede6e560cf0fe7dadab481f0d27a5edc4218d8bd 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3278,6 +3278,20 @@ public abstract class LivingEntity extends Entity { +@@ -3281,6 +3281,20 @@ public abstract class LivingEntity extends Entity { this.pushEntities(); this.level.getProfiler().pop(); diff --git a/patches/unapplied/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 80% rename from patches/unapplied/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch index 1954931c8..42c335b50 100644 --- a/patches/unapplied/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ca2e1f7735352ece4a05a21539e5606b16322322..a5199e0a95e1bb85c06de612ed7a54bec215deae 100644 +index b4d3bff060874871e3aebba1ba3570c8418a52bd..3bb1fe9e6f5e8f7dc6dc07f83c5b0793760882e8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1489,6 +1489,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1490,6 +1490,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } this.getChunkSource().blockChanged(pos); @@ -16,7 +16,7 @@ index ca2e1f7735352ece4a05a21539e5606b16322322..a5199e0a95e1bb85c06de612ed7a54be VoxelShape voxelshape = oldState.getCollisionShape(this, pos); VoxelShape voxelshape1 = newState.getCollisionShape(this, pos); -@@ -1530,6 +1531,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1531,6 +1532,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } } diff --git a/patches/unapplied/server/0585-Inline-shift-direction-fields.patch b/patches/server/0585-Inline-shift-direction-fields.patch similarity index 100% rename from patches/unapplied/server/0585-Inline-shift-direction-fields.patch rename to patches/server/0585-Inline-shift-direction-fields.patch diff --git a/patches/unapplied/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/unapplied/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/unapplied/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/unapplied/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/unapplied/server/0588-living-entity-allow-attribute-registration.patch b/patches/server/0588-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/unapplied/server/0588-living-entity-allow-attribute-registration.patch rename to patches/server/0588-living-entity-allow-attribute-registration.patch diff --git a/patches/unapplied/server/0589-fix-dead-slime-setSize-invincibility.patch b/patches/server/0589-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/unapplied/server/0589-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0589-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/unapplied/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/unapplied/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/unapplied/server/0591-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0591-Add-support-for-hex-color-codes-in-console.patch similarity index 99% rename from patches/unapplied/server/0591-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0591-Add-support-for-hex-color-codes-in-console.patch index 66f4f44c3..dfcbb6395 100644 --- a/patches/unapplied/server/0591-Add-support-for-hex-color-codes-in-console.patch +++ b/patches/server/0591-Add-support-for-hex-color-codes-in-console.patch @@ -282,7 +282,7 @@ index 0000000000000000000000000000000000000000..b4d0b7ecd56ab952319946854168c129 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 28fd97f854b6d86b738b3f3acdcc186d87d54136..666a97330ff03802f42b7d0d80ec083c134a4714 100644 +index e4f1ceb934917804fc415d3d06ebf9d093a44f7d..1387ed71ff09b834361e415e5fc78786f68dd371 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1671,7 +1671,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= 0 && packet.getSlot() < Inventory.getSelectionSize()) { diff --git a/patches/unapplied/server/0625-Added-PlayerDeepSleepEvent.patch b/patches/server/0625-Added-PlayerDeepSleepEvent.patch similarity index 85% rename from patches/unapplied/server/0625-Added-PlayerDeepSleepEvent.patch rename to patches/server/0625-Added-PlayerDeepSleepEvent.patch index 3d655f601..b7989ecad 100644 --- a/patches/unapplied/server/0625-Added-PlayerDeepSleepEvent.patch +++ b/patches/server/0625-Added-PlayerDeepSleepEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Added PlayerDeepSleepEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index f1a1a251256646d0d3a457f1fc8af20ae085f5ef..2c65305037583d55fa20783d0f264382467f8c3f 100644 +index 0960e5ecc25fad3eb46a871c2749dd176b812460..a6bd94ed379ef1ab0ffe71183aef3cf3061fd092 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -253,6 +253,11 @@ public abstract class Player extends LivingEntity { +@@ -254,6 +254,11 @@ public abstract class Player extends LivingEntity { if (this.isSleeping()) { ++this.sleepCounter; diff --git a/patches/unapplied/server/0626-More-World-API.patch b/patches/server/0626-More-World-API.patch similarity index 100% rename from patches/unapplied/server/0626-More-World-API.patch rename to patches/server/0626-More-World-API.patch diff --git a/patches/unapplied/server/0627-Added-PlayerBedFailEnterEvent.patch b/patches/server/0627-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/unapplied/server/0627-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0627-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/unapplied/server/0628-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0628-Implement-methods-to-convert-between-Component-and-B.patch similarity index 96% rename from patches/unapplied/server/0628-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0628-Implement-methods-to-convert-between-Component-and-B.patch index 79e7635b2..3e1d661a2 100644 --- a/patches/unapplied/server/0628-Implement-methods-to-convert-between-Component-and-B.patch +++ b/patches/server/0628-Implement-methods-to-convert-between-Component-and-B.patch @@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 17d71eeca335fb7c9b56c4ef80a4499def5789cb..f99c616006d49d91922abf5283146bc6f4fb5493 100644 +index f812b0a2d5534a7c443361bd69cfc2fe2110ba9a..2c215e2080f00d6c875fbde92fd2c1c051d0cf98 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -214,6 +214,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/unapplied/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 86% rename from patches/unapplied/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch index b2973e3d1..d435b588d 100644 --- a/patches/unapplied/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch +++ b/patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 39857a042d13c3660cd7cd49cd1117cafbc5dfad..fec39b8a3f67af2628913056634d6ee62b77d05d 100644 +index c44c57df38d42dee60ac07cee9797e31692af10d..5b3e99c7d7af09a035278b90806853505b54f1fa 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -851,6 +851,7 @@ public abstract class PlayerList { +@@ -855,6 +855,7 @@ public abstract class PlayerList { // Paper start boolean isBedSpawn = false; @@ -17,7 +17,7 @@ index 39857a042d13c3660cd7cd49cd1117cafbc5dfad..fec39b8a3f67af2628913056634d6ee6 boolean isRespawn = false; boolean isLocAltered = false; // Paper - Fix SPIGOT-5989 // Paper end -@@ -871,6 +872,7 @@ public abstract class PlayerList { +@@ -875,6 +876,7 @@ public abstract class PlayerList { if (optional.isPresent()) { BlockState iblockdata = worldserver1.getBlockState(blockposition); boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR); @@ -25,7 +25,7 @@ index 39857a042d13c3660cd7cd49cd1117cafbc5dfad..fec39b8a3f67af2628913056634d6ee6 Vec3 vec3d = (Vec3) optional.get(); float f1; -@@ -899,7 +901,7 @@ public abstract class PlayerList { +@@ -903,7 +905,7 @@ public abstract class PlayerList { } Player respawnPlayer = entityplayer1.getBukkitEntity(); diff --git a/patches/unapplied/server/0630-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0630-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/unapplied/server/0630-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0630-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/unapplied/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 88% rename from patches/unapplied/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch index a513fca82..ed8deb279 100644 --- a/patches/unapplied/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 200886cb577959812f9b384d8af061806fe03e5e..a698c43128dd9303af7715fc912c01fb835d426a 100644 +index 8b52453f67347625e68ff0c439fb65820dbcf959..749269cf1af41717d50eec75ab0f9a8e51370273 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2674,7 +2674,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -2877,7 +2877,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic case PERFORM_RESPAWN: if (this.player.wonGame) { this.player.wonGame = false; @@ -18,10 +18,10 @@ index 200886cb577959812f9b384d8af061806fe03e5e..a698c43128dd9303af7715fc912c01fb } else { if (this.player.getHealth() > 0.0F) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index fec39b8a3f67af2628913056634d6ee62b77d05d..a4278a4ca0b41813b8f88d01dcc8d75b4f458908 100644 +index 5b3e99c7d7af09a035278b90806853505b54f1fa..3e8934a141bc8c650549afaef7b4f8b02371f9ab 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -810,6 +810,12 @@ public abstract class PlayerList { +@@ -814,6 +814,12 @@ public abstract class PlayerList { } public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation) { @@ -34,7 +34,7 @@ index fec39b8a3f67af2628913056634d6ee62b77d05d..a4278a4ca0b41813b8f88d01dcc8d75b entityplayer.stopRiding(); // CraftBukkit this.players.remove(entityplayer); this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot -@@ -901,7 +907,7 @@ public abstract class PlayerList { +@@ -905,7 +911,7 @@ public abstract class PlayerList { } Player respawnPlayer = entityplayer1.getBukkitEntity(); diff --git a/patches/unapplied/server/0632-Add-Channel-initialization-listeners.patch b/patches/server/0632-Add-Channel-initialization-listeners.patch similarity index 94% rename from patches/unapplied/server/0632-Add-Channel-initialization-listeners.patch rename to patches/server/0632-Add-Channel-initialization-listeners.patch index bbef1c092..e68cdca32 100644 --- a/patches/unapplied/server/0632-Add-Channel-initialization-listeners.patch +++ b/patches/server/0632-Add-Channel-initialization-listeners.patch @@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..0d7e7db9e37ef0183c32b217bd944fb4 + COMPRESSION_DISABLED +} diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 91556b52edaa1d5c4dc73a825c77b9a66b002c61..91cf0a6b5061bf4731731fdd69beb80fb30c6b51 100644 +index cc1aa02fdf214b63aa105f3b0b12723dc359d287..023c564248adb2c5c4b679be9075ca88cb2d5b62 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -555,6 +555,7 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -567,6 +567,7 @@ public class Connection extends SimpleChannelInboundHandler> { } else { this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold)); } @@ -133,7 +133,7 @@ index 91556b52edaa1d5c4dc73a825c77b9a66b002c61..91cf0a6b5061bf4731731fdd69beb80f } else { if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) { this.channel.pipeline().remove("decompress"); -@@ -563,6 +564,7 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -575,6 +576,7 @@ public class Connection extends SimpleChannelInboundHandler> { if (this.channel.pipeline().get("compress") instanceof CompressionEncoder) { this.channel.pipeline().remove("compress"); } @@ -142,10 +142,10 @@ index 91556b52edaa1d5c4dc73a825c77b9a66b002c61..91cf0a6b5061bf4731731fdd69beb80f } diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -index 72fbc58f7d003b7af3c35e5fc504010307c7086b..076c1d5fb69a4a30b3e412e85b17db09fd9a1def 100644 +index 1b38326c9a709536dc4cccf9af93aede98a1a782..83af90fb0dcb4b1a5a68f655cf66d101b472e8e7 100644 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java -@@ -113,6 +113,7 @@ public class ServerConnectionListener { +@@ -114,6 +114,7 @@ public class ServerConnectionListener { pending.add((Connection) object); // Paper channel.pipeline().addLast("packet_handler", (ChannelHandler) object); ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object)); diff --git a/patches/unapplied/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 88% rename from patches/unapplied/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch index 64a9abbcc..8750ad503 100644 --- a/patches/unapplied/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch +++ b/patches/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Send empty commands if tab completion is disabled diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index 2dc41adc4e915f98451d79f0826b75560b716d21..f34e8f5b6837473b5aef96fea89ec7564a86f430 100644 +index d6da53fffd7c0a5a971e4510b7d433ea2cca06d2..edf980cf8992ddfe003ced279fe1324fc2364e5a 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java -@@ -348,7 +348,12 @@ public class Commands { +@@ -359,7 +359,12 @@ public class Commands { } public void sendCommands(ServerPlayer player) { diff --git a/patches/unapplied/server/0634-Add-more-WanderingTrader-API.patch b/patches/server/0634-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/unapplied/server/0634-Add-more-WanderingTrader-API.patch rename to patches/server/0634-Add-more-WanderingTrader-API.patch diff --git a/patches/unapplied/server/0635-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0635-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/unapplied/server/0635-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0635-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/unapplied/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 90% rename from patches/unapplied/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch index 1eae76c52..4169ad075 100644 --- a/patches/unapplied/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch +++ b/patches/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Adventure message to PlayerAdvancementDoneEvent diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java -index a4f2eb219cc57303cc6642e6782700591e423cf4..de0513b38e5fa0138f1cee6bb633561be12449fc 100644 +index e7ec5e1144c1596b035f97fb1fb86d18e61be3c9..a0c19503aabab5378d672a30163d35a5ba05b6c1 100644 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java -@@ -289,10 +289,18 @@ public class PlayerAdvancements { +@@ -287,10 +287,18 @@ public class PlayerAdvancements { this.progressChanged.add(advancement); flag = true; if (!flag1 && advancementprogress.isDone()) { @@ -22,10 +22,10 @@ index a4f2eb219cc57303cc6642e6782700591e423cf4..de0513b38e5fa0138f1cee6bb633561b + // Paper end advancement.getRewards().grant(this.player); - if (advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) { -- this.playerList.broadcastSystemMessage(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent()), ChatType.SYSTEM); +- this.playerList.broadcastSystemMessage(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent()), false); + // Paper start - Add Adventure message to PlayerAdvancementDoneEvent + if (message != null && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) { -+ this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), ChatType.SYSTEM); ++ this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), false); + // Paper end } } diff --git a/patches/unapplied/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 90% rename from patches/unapplied/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch index 78e9c23a1..8d8be2973 100644 --- a/patches/unapplied/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch +++ b/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 000ee7e12a1c756e065e99ebdbcf4a51047ec4d3..2d718967cacad744a4fe1ee7cf48e613172e1b03 100644 +index 0ad129adf726049c62f8d5c816cc32b3b6b9b2eb..c8a29ec3eac3ae61731cdc4f142578d98ec993ff 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -412,12 +412,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener +@@ -414,12 +414,13 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se // Paper end String playerName = ServerLoginPacketListenerImpl.this.gameProfile.getName(); java.net.InetAddress address = ((java.net.InetSocketAddress) ServerLoginPacketListenerImpl.this.connection.getRemoteAddress()).getAddress(); diff --git a/patches/unapplied/server/0638-Inventory-close.patch b/patches/server/0638-Inventory-close.patch similarity index 100% rename from patches/unapplied/server/0638-Inventory-close.patch rename to patches/server/0638-Inventory-close.patch diff --git a/patches/unapplied/server/0639-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0639-call-PortalCreateEvent-players-and-end-platform.patch similarity index 91% rename from patches/unapplied/server/0639-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0639-call-PortalCreateEvent-players-and-end-platform.patch index cc13959a7..d31d46dd9 100644 --- a/patches/unapplied/server/0639-call-PortalCreateEvent-players-and-end-platform.patch +++ b/patches/server/0639-call-PortalCreateEvent-players-and-end-platform.patch @@ -5,10 +5,10 @@ Subject: [PATCH] call PortalCreateEvent players and end platform diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 13722ce83df3dc9c5a1acd8c92b0a40db6becbcf..091289655fbf6d962ec275c3f5783d6cd307204e 100644 +index 6b6e0c408d22994a29bc562da523e0dc0575639f..d8bbab6af9625cdb411df0099261f97f59daacb4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1210,15 +1210,21 @@ public class ServerPlayer extends Player { +@@ -1208,15 +1208,21 @@ public class ServerPlayer extends Player { private void createEndPlatform(ServerLevel world, BlockPos centerPos) { BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable(); diff --git a/patches/unapplied/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/unapplied/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/unapplied/server/0641-Fix-CraftPotionBrewer-cache.patch b/patches/server/0641-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/unapplied/server/0641-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0641-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/unapplied/server/0642-Add-basic-Datapack-API.patch b/patches/server/0642-Add-basic-Datapack-API.patch similarity index 100% rename from patches/unapplied/server/0642-Add-basic-Datapack-API.patch rename to patches/server/0642-Add-basic-Datapack-API.patch diff --git a/patches/unapplied/server/0643-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0643-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/unapplied/server/0643-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0643-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/unapplied/server/0644-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch similarity index 93% rename from patches/unapplied/server/0644-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch index 134d1f6dd..85081e303 100644 --- a/patches/unapplied/server/0644-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch @@ -45,10 +45,10 @@ index 65089c0e78c9913a92ae9c66d664f48e2112ad92..7882ee2b7813d437d3b7580f046f38e7 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 091289655fbf6d962ec275c3f5783d6cd307204e..3c50ec169546a9e6e071e5c54ad3c77eb495f1d8 100644 +index d8bbab6af9625cdb411df0099261f97f59daacb4..607a44d2db927e579d8be7c52021d7bb205a379c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1812,8 +1812,15 @@ public class ServerPlayer extends Player { +@@ -1810,8 +1810,15 @@ public class ServerPlayer extends Player { } public boolean setGameMode(GameType gameMode) { @@ -66,7 +66,7 @@ index 091289655fbf6d962ec275c3f5783d6cd307204e..3c50ec169546a9e6e071e5c54ad3c77e } else { this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId())); if (gameMode == GameType.SPECTATOR) { -@@ -1825,7 +1832,7 @@ public class ServerPlayer extends Player { +@@ -1823,7 +1830,7 @@ public class ServerPlayer extends Player { this.onUpdateAbilities(); this.updateEffectVisibility(); @@ -75,7 +75,7 @@ index 091289655fbf6d962ec275c3f5783d6cd307204e..3c50ec169546a9e6e071e5c54ad3c77e } } -@@ -2231,6 +2238,16 @@ public class ServerPlayer extends Player { +@@ -2220,6 +2227,16 @@ public class ServerPlayer extends Player { } public void loadGameTypes(@Nullable CompoundTag nbt) { @@ -126,10 +126,10 @@ index 32746dfbc2fdfc150583676b1bf0762398b76d75..1ad1f958a9b6e1bc21f1c505aa7ea549 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a698c43128dd9303af7715fc912c01fb835d426a..7abd31f1f18624cc69262fedb072008d9ff43af1 100644 +index 749269cf1af41717d50eec75ab0f9a8e51370273..e6d496324d9188e7885687ff6fb62bfeb32a1ecc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2683,7 +2683,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -2886,7 +2886,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.player = this.server.getPlayerList().respawn(this.player, false); if (this.server.isHardcore()) { @@ -139,7 +139,7 @@ index a698c43128dd9303af7715fc912c01fb835d426a..7abd31f1f18624cc69262fedb072008d } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 202c5108f2e15e0d71c4e2854b17a027c7e495af..8c07b6e92a7329d72ccf1adf9f788322a4e9b28c 100644 +index e3ea73cc055a0738bc575f7f523bd61ff050e171..cacadcbffdc9629e693dfea6185009ebca2740f6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1384,7 +1384,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0645-ItemStack-repair-check-API.patch b/patches/server/0645-ItemStack-repair-check-API.patch similarity index 97% rename from patches/unapplied/server/0645-ItemStack-repair-check-API.patch rename to patches/server/0645-ItemStack-repair-check-API.patch index 553e56cb0..6a48f8e5e 100644 --- a/patches/unapplied/server/0645-ItemStack-repair-check-API.patch +++ b/patches/server/0645-ItemStack-repair-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index a978c39049efb30fcb66703b708a0e40868e2a58..57b7fedcccbb9a0c1cc56eb6be48a18e2fbadc7f 100644 +index 56e50bdb8116f934fd65212f13601b8c9d76c749..44b922c9e6f022c1a9282c0cb686bbd8a8d1c675 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -537,6 +537,14 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/unapplied/server/0646-More-Enchantment-API.patch b/patches/server/0646-More-Enchantment-API.patch similarity index 100% rename from patches/unapplied/server/0646-More-Enchantment-API.patch rename to patches/server/0646-More-Enchantment-API.patch