diff --git a/patches/removed/1.19/0542-MC-4-Fix-item-position-desync.patch b/patches/removed/1.19/0542-MC-4-Fix-item-position-desync.patch deleted file mode 100644 index 40df824fa..000000000 --- a/patches/removed/1.19/0542-MC-4-Fix-item-position-desync.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Tue, 8 Dec 2020 20:24:52 -0600 -Subject: [PATCH] MC-4: Fix item position desync - -This fixes item position desync (MC-4) by running the item coordinates -through the encode/decode methods of the packet that causes the precision -loss, which forces the server to lose the same precision as the client -keeping them in sync. - -1.19: entity tracking position changes - -diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ccc60a5465efa2b71fc2593d75af62c0b64fe66c..1adbceadd5df96e17796561a40eb7b760493440e 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java -+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -101,6 +101,11 @@ public class PaperConfig { - trackPluginScoreboards = getBoolean("settings.track-plugin-scoreboards", false); - } - -+ public static boolean fixEntityPositionDesync = true; -+ private static void fixEntityPositionDesync() { -+ fixEntityPositionDesync = getBoolean("settings.fix-entity-position-desync", fixEntityPositionDesync); -+ } -+ - public static void registerCommands() { - for (Map.Entry entry : commands.entrySet()) { - MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue()); -diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java -index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f900d72dab 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java -+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundMoveEntityPacket.java -@@ -21,11 +21,11 @@ public abstract class ClientboundMoveEntityPacket implements Packet +Date: Tue, 8 Dec 2020 20:24:52 -0600 +Subject: [PATCH] MC-4: Fix item position desync + +This fixes item position desync (MC-4) by running the item coordinates +through the encode/decode methods of the packet that causes the precision +loss, which forces the server to lose the same precision as the client +keeping them in sync. + +diff --git a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java +index 3768a71491ef7836b9739bdaec7a077c523dbacd..a57957ace1a72b3308487f180a366c3879eceb21 100644 +--- a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java ++++ b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java +@@ -8,11 +8,11 @@ public class VecDeltaCodec { + public Vec3 base = Vec3.ZERO; // Paper + + private static long encode(double value) { +- return Mth.lfloor(value * 4096.0D); ++ return Mth.lfloor(value * 4096.0D); // Paper - check ItemEntity#setPosRaw on update + } + + private static double decode(long value) { +- return (double)value / 4096.0D; ++ return (double)value / 4096.0D; // Paper - check ItemEntity#setPosRaw on update + } + + 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 6b49e66f0e45eb7ed525fe4314d2a9615212f7e4..4f9a5837d66c1940385e94f80d865cde1c4cf2a2 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -3888,6 +3888,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { + } + public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) { + // Paper end ++ // Paper start - fix MC-4 ++ if (this instanceof ItemEntity) { ++ if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.fixEntityPositionDesync) { ++ // encode/decode from PacketPlayOutEntity ++ x = Mth.lfloor(x * 4096.0D) * (1 / 4096.0D); ++ y = Mth.lfloor(y * 4096.0D) * (1 / 4096.0D); ++ z = Mth.lfloor(z * 4096.0D) * (1 / 4096.0D); ++ } ++ } ++ // Paper end - fix MC-4 + if (this.position.x != x || this.position.y != y || this.position.z != z) { + this.position = new Vec3(x, y, z); + int i = Mth.floor(x); diff --git a/patches/server/0543-Additional-Block-Material-API-s.patch b/patches/server/0544-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0543-Additional-Block-Material-API-s.patch rename to patches/server/0544-Additional-Block-Material-API-s.patch diff --git a/patches/server/0544-Fix-harming-potion-dupe.patch b/patches/server/0545-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0544-Fix-harming-potion-dupe.patch rename to patches/server/0545-Fix-harming-potion-dupe.patch diff --git a/patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0546-Cache-burn-durations.patch b/patches/server/0547-Cache-burn-durations.patch similarity index 100% rename from patches/server/0546-Cache-burn-durations.patch rename to patches/server/0547-Cache-burn-durations.patch diff --git a/patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0551-Zombie-API-breaking-doors.patch b/patches/server/0552-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0551-Zombie-API-breaking-doors.patch rename to patches/server/0552-Zombie-API-breaking-doors.patch diff --git a/patches/server/0552-Fix-nerfed-slime-when-splitting.patch b/patches/server/0553-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0552-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0553-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0553-Add-EntityLoadCrossbowEvent.patch b/patches/server/0554-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0553-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0554-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0554-Guardian-beam-workaround.patch b/patches/server/0555-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0554-Guardian-beam-workaround.patch rename to patches/server/0555-Guardian-beam-workaround.patch diff --git a/patches/server/0555-Added-WorldGameRuleChangeEvent.patch b/patches/server/0556-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0555-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0556-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0556-Added-ServerResourcesReloadedEvent.patch b/patches/server/0557-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0556-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0557-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0558-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0559-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0558-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0559-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0559-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0560-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0559-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0560-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0561-Configurable-door-breaking-difficulty.patch b/patches/server/0562-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0561-Configurable-door-breaking-difficulty.patch rename to patches/server/0562-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0562-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0563-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0562-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0563-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0564-Remove-stale-POIs.patch b/patches/server/0565-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0564-Remove-stale-POIs.patch rename to patches/server/0565-Remove-stale-POIs.patch diff --git a/patches/server/0565-Fix-villager-boat-exploit.patch b/patches/server/0566-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0565-Fix-villager-boat-exploit.patch rename to patches/server/0566-Fix-villager-boat-exploit.patch diff --git a/patches/server/0566-Add-sendOpLevel-API.patch b/patches/server/0567-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0566-Add-sendOpLevel-API.patch rename to patches/server/0567-Add-sendOpLevel-API.patch diff --git a/patches/server/0567-Add-PaperRegistry.patch b/patches/server/0568-Add-PaperRegistry.patch similarity index 100% rename from patches/server/0567-Add-PaperRegistry.patch rename to patches/server/0568-Add-PaperRegistry.patch diff --git a/patches/server/0568-Add-StructuresLocateEvent.patch b/patches/server/0569-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0568-Add-StructuresLocateEvent.patch rename to patches/server/0569-Add-StructuresLocateEvent.patch diff --git a/patches/server/0569-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0570-Collision-option-for-requiring-a-player-participant.patch similarity index 96% rename from patches/server/0569-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0570-Collision-option-for-requiring-a-player-participant.patch index d10e251d4..d2a1ca36e 100644 --- a/patches/server/0569-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0570-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6b49e66f0e45eb7ed525fe4314d2a9615212f7e4..7634e8a8859f6fbf68cc3f62c698ecb84264f9c0 100644 +index 4f9a5837d66c1940385e94f80d865cde1c4cf2a2..db6be2d9144fb1da9583833849f7b5518402c26d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1714,6 +1714,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0572-Make-schedule-command-per-world.patch b/patches/server/0573-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0572-Make-schedule-command-per-world.patch rename to patches/server/0573-Make-schedule-command-per-world.patch diff --git a/patches/server/0573-Configurable-max-leash-distance.patch b/patches/server/0574-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0573-Configurable-max-leash-distance.patch rename to patches/server/0574-Configurable-max-leash-distance.patch diff --git a/patches/server/0574-Implement-BlockPreDispenseEvent.patch b/patches/server/0575-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0574-Implement-BlockPreDispenseEvent.patch rename to patches/server/0575-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0579-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0580-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0579-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0580-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0580-add-DragonEggFormEvent.patch b/patches/server/0581-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0580-add-DragonEggFormEvent.patch rename to patches/server/0581-add-DragonEggFormEvent.patch diff --git a/patches/server/0581-EntityMoveEvent.patch b/patches/server/0582-EntityMoveEvent.patch similarity index 100% rename from patches/server/0581-EntityMoveEvent.patch rename to patches/server/0582-EntityMoveEvent.patch diff --git a/patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0583-Inline-shift-direction-fields.patch b/patches/server/0584-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0583-Inline-shift-direction-fields.patch rename to patches/server/0584-Inline-shift-direction-fields.patch diff --git a/patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0586-living-entity-allow-attribute-registration.patch b/patches/server/0587-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0586-living-entity-allow-attribute-registration.patch rename to patches/server/0587-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0587-fix-dead-slime-setSize-invincibility.patch b/patches/server/0588-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0587-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0588-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0589-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0589-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0590-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0590-Expose-Tracked-Players.patch b/patches/server/0591-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0590-Expose-Tracked-Players.patch rename to patches/server/0591-Expose-Tracked-Players.patch diff --git a/patches/server/0591-Remove-streams-from-SensorNearest.patch b/patches/server/0592-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0591-Remove-streams-from-SensorNearest.patch rename to patches/server/0592-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0593-Improve-ServerGUI.patch b/patches/server/0594-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0593-Improve-ServerGUI.patch rename to patches/server/0594-Improve-ServerGUI.patch diff --git a/patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0595-fix-converting-txt-to-json-file.patch b/patches/server/0596-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0595-fix-converting-txt-to-json-file.patch rename to patches/server/0596-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0596-Add-worldborder-events.patch b/patches/server/0597-Add-worldborder-events.patch similarity index 100% rename from patches/server/0596-Add-worldborder-events.patch rename to patches/server/0597-Add-worldborder-events.patch diff --git a/patches/server/0597-added-PlayerNameEntityEvent.patch b/patches/server/0598-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0597-added-PlayerNameEntityEvent.patch rename to patches/server/0598-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0598-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0599-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0598-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0599-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0599-Add-recipe-to-cook-events.patch b/patches/server/0600-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0599-Add-recipe-to-cook-events.patch rename to patches/server/0600-Add-recipe-to-cook-events.patch diff --git a/patches/server/0600-Add-Block-isValidTool.patch b/patches/server/0601-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0600-Add-Block-isValidTool.patch rename to patches/server/0601-Add-Block-isValidTool.patch diff --git a/patches/server/0601-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0601-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0602-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0602-Expand-world-key-API.patch b/patches/server/0603-Expand-world-key-API.patch similarity index 100% rename from patches/server/0602-Expand-world-key-API.patch rename to patches/server/0603-Expand-world-key-API.patch diff --git a/patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0604-Item-Rarity-API.patch b/patches/server/0605-Item-Rarity-API.patch similarity index 100% rename from patches/server/0604-Item-Rarity-API.patch rename to patches/server/0605-Item-Rarity-API.patch diff --git a/patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0606-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0607-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0606-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0607-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0608-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0609-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0608-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0609-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0610-Entity-load-save-limit-per-chunk.patch b/patches/server/0611-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0610-Entity-load-save-limit-per-chunk.patch rename to patches/server/0611-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0611-Expose-protocol-version.patch b/patches/server/0612-Expose-protocol-version.patch similarity index 100% rename from patches/server/0611-Expose-protocol-version.patch rename to patches/server/0612-Expose-protocol-version.patch diff --git a/patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0615-Add-bypass-host-check.patch b/patches/server/0616-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0615-Add-bypass-host-check.patch rename to patches/server/0616-Add-bypass-host-check.patch diff --git a/patches/server/0616-Set-area-affect-cloud-rotation.patch b/patches/server/0617-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0616-Set-area-affect-cloud-rotation.patch rename to patches/server/0617-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0623-Added-PlayerDeepSleepEvent.patch b/patches/server/0624-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0623-Added-PlayerDeepSleepEvent.patch rename to patches/server/0624-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0624-More-World-API.patch b/patches/server/0625-More-World-API.patch similarity index 100% rename from patches/server/0624-More-World-API.patch rename to patches/server/0625-More-World-API.patch diff --git a/patches/server/0625-Added-PlayerBedFailEnterEvent.patch b/patches/server/0626-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0625-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0626-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0628-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0629-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0628-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0629-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0630-Add-Channel-initialization-listeners.patch b/patches/server/0631-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0630-Add-Channel-initialization-listeners.patch rename to patches/server/0631-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0632-Add-more-WanderingTrader-API.patch b/patches/server/0633-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0632-Add-more-WanderingTrader-API.patch rename to patches/server/0633-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0633-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0634-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0633-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0634-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0636-Inventory-close.patch b/patches/server/0637-Inventory-close.patch similarity index 100% rename from patches/server/0636-Inventory-close.patch rename to patches/server/0637-Inventory-close.patch diff --git a/patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0639-Fix-CraftPotionBrewer-cache.patch b/patches/server/0640-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0639-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0640-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0640-Add-basic-Datapack-API.patch b/patches/server/0641-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0640-Add-basic-Datapack-API.patch rename to patches/server/0641-Add-basic-Datapack-API.patch diff --git a/patches/server/0641-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0642-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0641-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0642-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0643-ItemStack-repair-check-API.patch b/patches/server/0644-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0643-ItemStack-repair-check-API.patch rename to patches/server/0644-ItemStack-repair-check-API.patch diff --git a/patches/server/0644-More-Enchantment-API.patch b/patches/server/0645-More-Enchantment-API.patch similarity index 100% rename from patches/server/0644-More-Enchantment-API.patch rename to patches/server/0645-More-Enchantment-API.patch diff --git a/patches/server/0645-Move-range-check-for-block-placing-up.patch b/patches/server/0646-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0645-Move-range-check-for-block-placing-up.patch rename to patches/server/0646-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0646-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0646-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0647-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0647-Add-Mob-lookAt-API.patch b/patches/server/0648-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0647-Add-Mob-lookAt-API.patch rename to patches/server/0648-Add-Mob-lookAt-API.patch diff --git a/patches/server/0648-Add-Unix-domain-socket-support.patch b/patches/server/0649-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0648-Add-Unix-domain-socket-support.patch rename to patches/server/0649-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0649-Add-EntityInsideBlockEvent.patch b/patches/server/0650-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0649-Add-EntityInsideBlockEvent.patch rename to patches/server/0650-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0650-Attributes-API-for-item-defaults.patch b/patches/server/0651-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0650-Attributes-API-for-item-defaults.patch rename to patches/server/0651-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0652-More-Lidded-Block-API.patch b/patches/server/0653-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0652-More-Lidded-Block-API.patch rename to patches/server/0653-More-Lidded-Block-API.patch diff --git a/patches/server/0653-Limit-item-frame-cursors-on-maps.patch b/patches/server/0654-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0653-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0654-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0654-Add-PlayerKickEvent-causes.patch b/patches/server/0655-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0654-Add-PlayerKickEvent-causes.patch rename to patches/server/0655-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0655-Add-PufferFishStateChangeEvent.patch b/patches/server/0656-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0655-Add-PufferFishStateChangeEvent.patch rename to patches/server/0656-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0659-Add-BellRevealRaiderEvent.patch b/patches/server/0660-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0659-Add-BellRevealRaiderEvent.patch rename to patches/server/0660-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0660-Fix-invulnerable-end-crystals.patch b/patches/server/0661-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0660-Fix-invulnerable-end-crystals.patch rename to patches/server/0661-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0661-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0662-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0661-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0662-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0662-Fix-dangerous-end-portal-logic.patch b/patches/server/0663-Fix-dangerous-end-portal-logic.patch similarity index 97% rename from patches/server/0662-Fix-dangerous-end-portal-logic.patch rename to patches/server/0663-Fix-dangerous-end-portal-logic.patch index f29fd98fb..7ff34994c 100644 --- a/patches/server/0662-Fix-dangerous-end-portal-logic.patch +++ b/patches/server/0663-Fix-dangerous-end-portal-logic.patch @@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was designed to happen in the first place. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7634e8a8859f6fbf68cc3f62c698ecb84264f9c0..8813d1720879f8b75d1d1c5f4e8f4414c663bfd6 100644 +index db6be2d9144fb1da9583833849f7b5518402c26d..b5b949a29951b0d1cd1345a2a751eb413484b7e3 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -453,6 +453,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0664-Make-item-validations-configurable.patch b/patches/server/0665-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0664-Make-item-validations-configurable.patch rename to patches/server/0665-Make-item-validations-configurable.patch diff --git a/patches/server/0665-Line-Of-Sight-Changes.patch b/patches/server/0666-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0665-Line-Of-Sight-Changes.patch rename to patches/server/0666-Line-Of-Sight-Changes.patch diff --git a/patches/server/0666-add-per-world-spawn-limits.patch b/patches/server/0667-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0666-add-per-world-spawn-limits.patch rename to patches/server/0667-add-per-world-spawn-limits.patch diff --git a/patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0668-Add-more-LimitedRegion-API.patch b/patches/server/0669-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0668-Add-more-LimitedRegion-API.patch rename to patches/server/0669-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0670-Missing-Entity-Behavior-API.patch b/patches/server/0671-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0670-Missing-Entity-Behavior-API.patch rename to patches/server/0671-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0675-Adds-PlayerArmSwingEvent.patch b/patches/server/0676-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0675-Adds-PlayerArmSwingEvent.patch rename to patches/server/0676-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0678-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0679-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0678-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0679-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0679-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0679-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0680-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0682-Stinger-API.patch b/patches/server/0683-Stinger-API.patch similarity index 100% rename from patches/server/0682-Stinger-API.patch rename to patches/server/0683-Stinger-API.patch diff --git a/patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0684-Add-System.out-err-catcher.patch b/patches/server/0685-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0684-Add-System.out-err-catcher.patch rename to patches/server/0685-Add-System.out-err-catcher.patch diff --git a/patches/server/0685-Fix-test-not-bootstrapping.patch b/patches/server/0686-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0685-Fix-test-not-bootstrapping.patch rename to patches/server/0686-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0687-Improve-boat-collision-performance.patch b/patches/server/0688-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0687-Improve-boat-collision-performance.patch rename to patches/server/0688-Improve-boat-collision-performance.patch diff --git a/patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0690-Add-PlayerSetSpawnEvent.patch b/patches/server/0691-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0690-Add-PlayerSetSpawnEvent.patch rename to patches/server/0691-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0692-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch similarity index 90% rename from patches/server/0692-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0693-Optimize-entity-tracker-passenger-checks.patch index 2d8bc7884..d3fef6720 100644 --- a/patches/server/0692-Optimize-entity-tracker-passenger-checks.patch +++ b/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize entity tracker passenger checks diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 7881176a900daa3306c691454f688c1f79b73475..f3b69a434988b8546ddf820117ff00848e0af983 100644 +index ddc5b4849939a96b76611cfa1cd34c06c7acc0f8..5246d427973f34843046e59c198785c73fccec33 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -71,7 +71,7 @@ public class ServerEntity { diff --git a/patches/server/0693-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0693-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0694-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0694-Added-EntityDamageItemEvent.patch b/patches/server/0695-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0694-Added-EntityDamageItemEvent.patch rename to patches/server/0695-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0695-Optimize-indirect-passenger-iteration.patch b/patches/server/0696-Optimize-indirect-passenger-iteration.patch similarity index 95% rename from patches/server/0695-Optimize-indirect-passenger-iteration.patch rename to patches/server/0696-Optimize-indirect-passenger-iteration.patch index a8f78d109..b1d82335e 100644 --- a/patches/server/0695-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0696-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8813d1720879f8b75d1d1c5f4e8f4414c663bfd6..03f57e6891dd870d481e4b12e6ef3dc032e26db1 100644 +index b5b949a29951b0d1cd1345a2a751eb413484b7e3..f0dfc052cf1c33b422c3e08c88217e3c49ad32ee 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3594,26 +3594,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch similarity index 93% rename from patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch index 3a5424513..5e1d739a7 100644 --- a/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch +++ b/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index f3b69a434988b8546ddf820117ff00848e0af983..8988561facae5c41dc64929d742316b104ddbbfa 100644 +index 5246d427973f34843046e59c198785c73fccec33..c84ec3b93f2783de7a2815f23a9f1de89c1ab109 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -100,7 +100,7 @@ public class ServerEntity { diff --git a/patches/server/0698-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0699-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0698-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0699-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0699-Clear-bucket-NBT-after-dispense.patch b/patches/server/0700-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0699-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0700-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0701-Add-BlockBreakBlockEvent.patch b/patches/server/0702-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0701-Add-BlockBreakBlockEvent.patch rename to patches/server/0702-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0703-More-CommandBlock-API.patch b/patches/server/0704-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0703-More-CommandBlock-API.patch rename to patches/server/0704-More-CommandBlock-API.patch diff --git a/patches/server/0704-Add-missing-team-sidebar-display-slots.patch b/patches/server/0705-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0704-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0705-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0705-Add-back-EntityPortalExitEvent.patch b/patches/server/0706-Add-back-EntityPortalExitEvent.patch similarity index 97% rename from patches/server/0705-Add-back-EntityPortalExitEvent.patch rename to patches/server/0706-Add-back-EntityPortalExitEvent.patch index 0b3f2effa..944522261 100644 --- a/patches/server/0705-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0706-Add-back-EntityPortalExitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 03f57e6891dd870d481e4b12e6ef3dc032e26db1..213b55b648b727ad605da62b691397c789279781 100644 +index f0dfc052cf1c33b422c3e08c88217e3c49ad32ee..7ebbfd7ba4e26539f45b59625a1138a5e053ede4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3095,6 +3095,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0707-Get-entity-default-attributes.patch b/patches/server/0708-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0707-Get-entity-default-attributes.patch rename to patches/server/0708-Get-entity-default-attributes.patch diff --git a/patches/server/0708-Left-handed-API.patch b/patches/server/0709-Left-handed-API.patch similarity index 100% rename from patches/server/0708-Left-handed-API.patch rename to patches/server/0709-Left-handed-API.patch diff --git a/patches/server/0709-Add-advancement-display-API.patch b/patches/server/0710-Add-advancement-display-API.patch similarity index 100% rename from patches/server/0709-Add-advancement-display-API.patch rename to patches/server/0710-Add-advancement-display-API.patch diff --git a/patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/server/0711-Add-critical-damage-API.patch b/patches/server/0712-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0711-Add-critical-damage-API.patch rename to patches/server/0712-Add-critical-damage-API.patch diff --git a/patches/server/0712-Fix-issues-with-mob-conversion.patch b/patches/server/0713-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0712-Fix-issues-with-mob-conversion.patch rename to patches/server/0713-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0713-Add-isCollidable-methods-to-various-places.patch b/patches/server/0714-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0713-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0714-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0714-Goat-ram-API.patch b/patches/server/0715-Goat-ram-API.patch similarity index 100% rename from patches/server/0714-Goat-ram-API.patch rename to patches/server/0715-Goat-ram-API.patch diff --git a/patches/server/0715-Add-API-for-resetting-a-single-score.patch b/patches/server/0716-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0715-Add-API-for-resetting-a-single-score.patch rename to patches/server/0716-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch similarity index 97% rename from patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch index 3aea9a6b3..5121d0953 100644 --- a/patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 213b55b648b727ad605da62b691397c789279781..5defa93d6016c383590b5cb882fdbb90700ba5d9 100644 +index 7ebbfd7ba4e26539f45b59625a1138a5e053ede4..e6ab931869bb44a2b70029b59140d0327b0898d7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1920,6 +1920,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0717-Vanilla-command-permission-fixes.patch b/patches/server/0718-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0717-Vanilla-command-permission-fixes.patch rename to patches/server/0718-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0718-Make-CallbackExecutor-strict-again.patch b/patches/server/0719-Make-CallbackExecutor-strict-again.patch similarity index 100% rename from patches/server/0718-Make-CallbackExecutor-strict-again.patch rename to patches/server/0719-Make-CallbackExecutor-strict-again.patch diff --git a/patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0722-Fix-GameProfileCache-concurrency.patch b/patches/server/0723-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0722-Fix-GameProfileCache-concurrency.patch rename to patches/server/0723-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 100% rename from patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch diff --git a/patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 100% rename from patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch diff --git a/patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch diff --git a/patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0727-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0728-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0727-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0728-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch similarity index 100% rename from patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch rename to patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch diff --git a/patches/server/0730-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0730-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0731-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0731-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0732-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0731-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0732-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0732-Optimise-general-POI-access.patch b/patches/server/0733-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0732-Optimise-general-POI-access.patch rename to patches/server/0733-Optimise-general-POI-access.patch diff --git a/patches/server/0733-Add-more-async-catchers.patch b/patches/server/0734-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0733-Add-more-async-catchers.patch rename to patches/server/0734-Add-more-async-catchers.patch diff --git a/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 99% rename from patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch index 5b5e482cc..d9b2fef05 100644 --- a/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch +++ b/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch @@ -953,7 +953,7 @@ index ba3023c7dd5b3bcf66f829fe5dc9757f96d16b45..05ff7bcc79e617904903cf082f6687d2 + // Paper end } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5defa93d6016c383590b5cb882fdbb90700ba5d9..9e0593c642186b1ef64432a20b41474ff51b7e15 100644 +index e6ab931869bb44a2b70029b59140d0327b0898d7..6536b992daf856ee84f4fce077d46061bebb90e4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -484,6 +484,56 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0735-Optimise-chunk-tick-iteration.patch b/patches/server/0736-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0735-Optimise-chunk-tick-iteration.patch rename to patches/server/0736-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0736-Execute-chunk-tasks-mid-tick.patch b/patches/server/0737-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0736-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0737-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0737-Do-not-copy-visible-chunks.patch b/patches/server/0738-Do-not-copy-visible-chunks.patch similarity index 100% rename from patches/server/0737-Do-not-copy-visible-chunks.patch rename to patches/server/0738-Do-not-copy-visible-chunks.patch diff --git a/patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0739-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0740-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0741-Detail-more-information-in-watchdog-dumps.patch similarity index 98% rename from patches/server/0740-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0741-Detail-more-information-in-watchdog-dumps.patch index 17b3bc428..ac982a02a 100644 --- a/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/0741-Detail-more-information-in-watchdog-dumps.patch @@ -123,7 +123,7 @@ index 572e635739cf43ddb4b4e51df59d4c2612b77034..d3470ba0b1732356d1082f23632dbe21 private void tickPassenger(Entity vehicle, Entity passenger) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9e0593c642186b1ef64432a20b41474ff51b7e15..85b55badc57ce6c062b87d87cc730d20bb9e27c0 100644 +index 6536b992daf856ee84f4fce077d46061bebb90e4..2013a0b402b0abcb0a47911cfaa8aa0ccf468f9b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -965,7 +965,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -193,9 +193,9 @@ index 9e0593c642186b1ef64432a20b41474ff51b7e15..85b55badc57ce6c062b87d87cc730d20 } public void setDeltaMovement(double x, double y, double z) { -@@ -4012,7 +4056,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { - public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) { - // Paper end +@@ -4022,7 +4066,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { + } + // Paper end - fix MC-4 if (this.position.x != x || this.position.y != y || this.position.z != z) { + synchronized (this.posLock) { // Paper this.position = new Vec3(x, y, z); diff --git a/patches/server/0741-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0742-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0741-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0742-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0742-Distance-manager-tick-timings.patch b/patches/server/0743-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0742-Distance-manager-tick-timings.patch rename to patches/server/0743-Distance-manager-tick-timings.patch diff --git a/patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0744-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0745-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0745-Add-packet-limiter-config.patch b/patches/server/0746-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0745-Add-packet-limiter-config.patch rename to patches/server/0746-Add-packet-limiter-config.patch diff --git a/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 100% rename from patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/server/0747-Use-correct-LevelStem-registry-when-loading-default-.patch diff --git a/patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0748-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0749-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0750-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0750-Time-scoreboard-search.patch b/patches/server/0751-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0750-Time-scoreboard-search.patch rename to patches/server/0751-Time-scoreboard-search.patch diff --git a/patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0752-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0753-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0753-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0754-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0753-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0754-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0755-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch similarity index 100% rename from patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch rename to patches/server/0756-Allow-removal-addition-of-entities-to-entity-ticklis.patch diff --git a/patches/server/0756-Optimise-random-block-ticking.patch b/patches/server/0757-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0756-Optimise-random-block-ticking.patch rename to patches/server/0757-Optimise-random-block-ticking.patch diff --git a/patches/server/0757-Optimise-non-flush-packet-sending.patch b/patches/server/0758-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0757-Optimise-non-flush-packet-sending.patch rename to patches/server/0758-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0758-Optimise-nearby-player-lookups.patch b/patches/server/0759-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0758-Optimise-nearby-player-lookups.patch rename to patches/server/0759-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0759-Optimise-WorldServer-notify.patch b/patches/server/0760-Optimise-WorldServer-notify.patch similarity index 100% rename from patches/server/0759-Optimise-WorldServer-notify.patch rename to patches/server/0760-Optimise-WorldServer-notify.patch diff --git a/patches/server/0760-Remove-streams-for-villager-AI.patch b/patches/server/0761-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0760-Remove-streams-for-villager-AI.patch rename to patches/server/0761-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0761-Rewrite-dataconverter-system.patch b/patches/server/0762-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0761-Rewrite-dataconverter-system.patch rename to patches/server/0762-Rewrite-dataconverter-system.patch diff --git a/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0764-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch similarity index 100% rename from patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch rename to patches/server/0765-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch diff --git a/patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch rename to patches/server/0766-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0768-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0769-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0770-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0771-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0771-Ensure-valid-vehicle-status.patch b/patches/server/0772-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0771-Ensure-valid-vehicle-status.patch rename to patches/server/0772-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0773-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0774-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0774-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0775-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0774-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0775-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0775-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0776-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0775-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0776-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch similarity index 100% rename from patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch rename to patches/server/0777-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch diff --git a/patches/server/0777-Preserve-overstacked-loot.patch b/patches/server/0778-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0777-Preserve-overstacked-loot.patch rename to patches/server/0778-Preserve-overstacked-loot.patch diff --git a/patches/server/0778-Update-head-rotation-in-missing-places.patch b/patches/server/0779-Update-head-rotation-in-missing-places.patch similarity index 93% rename from patches/server/0778-Update-head-rotation-in-missing-places.patch rename to patches/server/0779-Update-head-rotation-in-missing-places.patch index 85d614b93..01bcbb25a 100644 --- a/patches/server/0778-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0779-Update-head-rotation-in-missing-places.patch @@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 85b55badc57ce6c062b87d87cc730d20bb9e27c0..e107df89c2c645e93bf6c7fced3cf84c51490ef2 100644 +index 2013a0b402b0abcb0a47911cfaa8aa0ccf468f9b..4e1fc9c2a81a7e252a33f301198b9366dac03006 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1748,6 +1748,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0779-prevent-unintended-light-block-manipulation.patch b/patches/server/0780-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0779-prevent-unintended-light-block-manipulation.patch rename to patches/server/0780-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0780-Fix-CraftCriteria-defaults-map.patch b/patches/server/0781-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0780-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0781-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0781-Fix-upstreams-block-state-factories.patch b/patches/server/0782-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0781-Fix-upstreams-block-state-factories.patch rename to patches/server/0782-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0783-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0783-Configurable-feature-seeds.patch b/patches/server/0784-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0783-Configurable-feature-seeds.patch rename to patches/server/0784-Configurable-feature-seeds.patch diff --git a/patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0785-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0785-Add-root-admin-user-detection.patch b/patches/server/0786-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0785-Add-root-admin-user-detection.patch rename to patches/server/0786-Add-root-admin-user-detection.patch diff --git a/patches/server/0786-Always-allow-item-changing-in-Fireball.patch b/patches/server/0787-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0786-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0787-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch similarity index 91% rename from patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch index 9a0a0b284..40de2a3ff 100644 --- a/patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0788-don-t-attempt-to-teleport-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e107df89c2c645e93bf6c7fced3cf84c51490ef2..1faaf2ffc7ba32e13f2d1c60d26ddfd8e5648df6 100644 +index 4e1fc9c2a81a7e252a33f301198b9366dac03006..7d25d2b2c4d334ec5bf78ea13eb8de743cb2e5fb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -773,7 +773,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0790-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0790-Rewrite-the-light-engine.patch b/patches/server/0791-Rewrite-the-light-engine.patch similarity index 100% rename from patches/server/0790-Rewrite-the-light-engine.patch rename to patches/server/0791-Rewrite-the-light-engine.patch diff --git a/patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0792-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0793-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0795-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch similarity index 100% rename from patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch rename to patches/server/0796-Fix-kelp-modifier-changing-growth-for-other-crops.patch diff --git a/patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0797-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0797-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0798-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0797-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0798-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0798-Add-player-health-update-API.patch b/patches/server/0799-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0798-Add-player-health-update-API.patch rename to patches/server/0799-Add-player-health-update-API.patch diff --git a/patches/server/0799-Optimize-HashMapPalette.patch b/patches/server/0800-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0799-Optimize-HashMapPalette.patch rename to patches/server/0800-Optimize-HashMapPalette.patch diff --git a/patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0801-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 99% rename from patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index 025b005c0..528de8a06 100644 --- a/patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0802-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1215,7 +1215,7 @@ index d74d6669005d0669503253787636756a0c6590f4..6d013360d35c54d1493849b22c9d65b1 } // CraftBukkit start diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1faaf2ffc7ba32e13f2d1c60d26ddfd8e5648df6..82e22e1ad1059630547f16e405e5c553ace29a80 100644 +index 7d25d2b2c4d334ec5bf78ea13eb8de743cb2e5fb..615b0797c38ffbb3594905db90cbc495cc6df916 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1154,9 +1154,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0803-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0803-Actually-unload-POI-data.patch b/patches/server/0804-Actually-unload-POI-data.patch similarity index 100% rename from patches/server/0803-Actually-unload-POI-data.patch rename to patches/server/0804-Actually-unload-POI-data.patch diff --git a/patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0805-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0805-Update-Log4j.patch b/patches/server/0806-Update-Log4j.patch similarity index 100% rename from patches/server/0805-Update-Log4j.patch rename to patches/server/0806-Update-Log4j.patch diff --git a/patches/server/0806-Add-more-Campfire-API.patch b/patches/server/0807-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0806-Add-more-Campfire-API.patch rename to patches/server/0807-Add-more-Campfire-API.patch diff --git a/patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0808-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0808-Fix-tripwire-state-inconsistency.patch b/patches/server/0809-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0808-Fix-tripwire-state-inconsistency.patch rename to patches/server/0809-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch similarity index 100% rename from patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch rename to patches/server/0810-Fix-fluid-logging-on-Block-breakNaturally.patch diff --git a/patches/server/0810-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0811-Forward-CraftEntity-in-teleport-command.patch similarity index 95% rename from patches/server/0810-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0811-Forward-CraftEntity-in-teleport-command.patch index 8eeff8039..d59633599 100644 --- a/patches/server/0810-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0811-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 82e22e1ad1059630547f16e405e5c553ace29a80..71702c915e9519f85904af0e652e692bb1ba596f 100644 +index 615b0797c38ffbb3594905db90cbc495cc6df916..e0dec7b8acf2ed18bc9d0d60cb12329d9d5c1161 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3259,6 +3259,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0811-Improve-scoreboard-entries.patch b/patches/server/0812-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0811-Improve-scoreboard-entries.patch rename to patches/server/0812-Improve-scoreboard-entries.patch diff --git a/patches/server/0812-Entity-powdered-snow-API.patch b/patches/server/0813-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0812-Entity-powdered-snow-API.patch rename to patches/server/0813-Entity-powdered-snow-API.patch diff --git a/patches/server/0813-Add-API-for-item-entity-health.patch b/patches/server/0814-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0813-Add-API-for-item-entity-health.patch rename to patches/server/0814-Add-API-for-item-entity-health.patch diff --git a/patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0815-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0817-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0818-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0819-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0819-Fix-bees-aging-inside-hives.patch b/patches/server/0820-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0819-Fix-bees-aging-inside-hives.patch rename to patches/server/0820-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0820-Bucketable-API.patch b/patches/server/0821-Bucketable-API.patch similarity index 100% rename from patches/server/0820-Bucketable-API.patch rename to patches/server/0821-Bucketable-API.patch diff --git a/patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch similarity index 100% rename from patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch rename to patches/server/0822-Check-player-world-in-endPortalSoundRadius.patch diff --git a/patches/server/0822-Validate-usernames.patch b/patches/server/0823-Validate-usernames.patch similarity index 100% rename from patches/server/0822-Validate-usernames.patch rename to patches/server/0823-Validate-usernames.patch diff --git a/patches/server/0823-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0824-Fix-saving-configs-with-more-long-comments.patch similarity index 100% rename from patches/server/0823-Fix-saving-configs-with-more-long-comments.patch rename to patches/server/0824-Fix-saving-configs-with-more-long-comments.patch diff --git a/patches/server/0824-Make-water-animal-spawn-height-configurable.patch b/patches/server/0825-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0824-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0825-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0826-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0827-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0828-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0828-Multiple-Entries-with-Scoreboards.patch b/patches/server/0829-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0828-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0829-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0829-Reset-placed-block-on-exception.patch b/patches/server/0830-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0829-Reset-placed-block-on-exception.patch rename to patches/server/0830-Reset-placed-block-on-exception.patch diff --git a/patches/server/0830-Add-configurable-height-for-slime-spawn.patch b/patches/server/0831-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0830-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0831-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0832-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0832-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0833-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0832-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0833-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0833-Kick-on-main-for-illegal-chars.patch b/patches/server/0834-Kick-on-main-for-illegal-chars.patch similarity index 100% rename from patches/server/0833-Kick-on-main-for-illegal-chars.patch rename to patches/server/0834-Kick-on-main-for-illegal-chars.patch diff --git a/patches/server/0834-Multi-Block-Change-API-Implementation.patch b/patches/server/0835-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0834-Multi-Block-Change-API-Implementation.patch rename to patches/server/0835-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0835-Fix-NotePlayEvent.patch b/patches/server/0836-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0835-Fix-NotePlayEvent.patch rename to patches/server/0836-Fix-NotePlayEvent.patch diff --git a/patches/server/0836-Freeze-Tick-Lock-API.patch b/patches/server/0837-Freeze-Tick-Lock-API.patch similarity index 97% rename from patches/server/0836-Freeze-Tick-Lock-API.patch rename to patches/server/0837-Freeze-Tick-Lock-API.patch index d09d17ad3..25f6a1e9f 100644 --- a/patches/server/0836-Freeze-Tick-Lock-API.patch +++ b/patches/server/0837-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 71702c915e9519f85904af0e652e692bb1ba596f..ef40762094cc862716e1f8219cdbbf53bfde97b5 100644 +index e0dec7b8acf2ed18bc9d0d60cb12329d9d5c1161..1ee13fb0518406382468af125253286996670ec6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -391,6 +391,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0837-Dolphin-API.patch b/patches/server/0838-Dolphin-API.patch similarity index 100% rename from patches/server/0837-Dolphin-API.patch rename to patches/server/0838-Dolphin-API.patch diff --git a/patches/server/0838-More-PotionEffectType-API.patch b/patches/server/0839-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0838-More-PotionEffectType-API.patch rename to patches/server/0839-More-PotionEffectType-API.patch diff --git a/patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0840-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0841-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0841-Add-config-for-stronghold-seed.patch b/patches/server/0842-Add-config-for-stronghold-seed.patch similarity index 100% rename from patches/server/0841-Add-config-for-stronghold-seed.patch rename to patches/server/0842-Add-config-for-stronghold-seed.patch diff --git a/patches/server/0842-Implement-regenerateChunk.patch b/patches/server/0843-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0842-Implement-regenerateChunk.patch rename to patches/server/0843-Implement-regenerateChunk.patch diff --git a/patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch similarity index 100% rename from patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch rename to patches/server/0844-Log-exceptions-thrown-during-chat-processing.patch diff --git a/patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0845-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0846-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0846-Add-GameEvent-tags.patch b/patches/server/0847-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0846-Add-GameEvent-tags.patch rename to patches/server/0847-Add-GameEvent-tags.patch diff --git a/patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0848-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0848-Replace-ticket-level-propagator.patch b/patches/server/0849-Replace-ticket-level-propagator.patch similarity index 100% rename from patches/server/0848-Replace-ticket-level-propagator.patch rename to patches/server/0849-Replace-ticket-level-propagator.patch diff --git a/patches/server/0849-Furnace-RecipesUsed-API.patch b/patches/server/0850-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0849-Furnace-RecipesUsed-API.patch rename to patches/server/0850-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0850-Configurable-sculk-sensor-listener-range.patch b/patches/server/0851-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0850-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0851-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0851-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0852-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0851-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0852-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0852-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0852-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0853-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0853-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0853-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0854-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0854-Fix-Entity-Position-Desync.patch b/patches/server/0855-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0854-Fix-Entity-Position-Desync.patch rename to patches/server/0855-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0855-Custom-Potion-Mixes.patch b/patches/server/0856-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0855-Custom-Potion-Mixes.patch rename to patches/server/0856-Custom-Potion-Mixes.patch diff --git a/patches/server/0856-Replace-player-chunk-loader-system.patch b/patches/server/0857-Replace-player-chunk-loader-system.patch similarity index 100% rename from patches/server/0856-Replace-player-chunk-loader-system.patch rename to patches/server/0857-Replace-player-chunk-loader-system.patch diff --git a/patches/server/0857-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0858-Fix-Fluid-tags-isTagged-method.patch similarity index 100% rename from patches/server/0857-Fix-Fluid-tags-isTagged-method.patch rename to patches/server/0858-Fix-Fluid-tags-isTagged-method.patch diff --git a/patches/server/0858-Fix-World-locateNearestStructure.patch b/patches/server/0859-Fix-World-locateNearestStructure.patch similarity index 100% rename from patches/server/0858-Fix-World-locateNearestStructure.patch rename to patches/server/0859-Fix-World-locateNearestStructure.patch diff --git a/patches/server/0859-Force-close-world-loading-screen.patch b/patches/server/0860-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0859-Force-close-world-loading-screen.patch rename to patches/server/0860-Force-close-world-loading-screen.patch diff --git a/patches/server/0860-Fix-falling-block-spawn-methods.patch b/patches/server/0861-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0860-Fix-falling-block-spawn-methods.patch rename to patches/server/0861-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0861-Expose-furnace-minecart-push-values.patch b/patches/server/0862-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0861-Expose-furnace-minecart-push-values.patch rename to patches/server/0862-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0863-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0862-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0863-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0863-Fix-save-problems-on-shutdown.patch b/patches/server/0864-Fix-save-problems-on-shutdown.patch similarity index 100% rename from patches/server/0863-Fix-save-problems-on-shutdown.patch rename to patches/server/0864-Fix-save-problems-on-shutdown.patch diff --git a/patches/server/0864-More-Projectile-API.patch b/patches/server/0865-More-Projectile-API.patch similarity index 100% rename from patches/server/0864-More-Projectile-API.patch rename to patches/server/0865-More-Projectile-API.patch diff --git a/patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0866-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0865-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0866-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0867-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0866-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0867-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0867-Implement-getComputedBiome-API.patch b/patches/server/0868-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0867-Implement-getComputedBiome-API.patch rename to patches/server/0868-Implement-getComputedBiome-API.patch diff --git a/patches/server/0868-Make-some-itemstacks-nonnull.patch b/patches/server/0869-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0868-Make-some-itemstacks-nonnull.patch rename to patches/server/0869-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0870-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch similarity index 100% rename from patches/server/0869-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch rename to patches/server/0870-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch diff --git a/patches/server/0870-Implement-enchantWithLevels-API.patch b/patches/server/0871-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0870-Implement-enchantWithLevels-API.patch rename to patches/server/0871-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0871-Fix-saving-in-unloadWorld.patch b/patches/server/0872-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0871-Fix-saving-in-unloadWorld.patch rename to patches/server/0872-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0872-Buffer-OOB-setBlock-calls.patch b/patches/server/0873-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0872-Buffer-OOB-setBlock-calls.patch rename to patches/server/0873-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0873-Add-TameableDeathMessageEvent.patch b/patches/server/0874-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0873-Add-TameableDeathMessageEvent.patch rename to patches/server/0874-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0875-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch similarity index 100% rename from patches/server/0874-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch rename to patches/server/0875-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch diff --git a/patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0876-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0875-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0876-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0877-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 92% rename from patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0877-Ensure-entity-passenger-world-matches-ridden-entity.patch index 8139b0a5c..4bfc99a5d 100644 --- a/patches/server/0876-Ensure-entity-passenger-world-matches-ridden-entity.patch +++ b/patches/server/0877-Ensure-entity-passenger-world-matches-ridden-entity.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity Bad plugins doing this would cause some obvious problems... diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ef40762094cc862716e1f8219cdbbf53bfde97b5..302c41a92ede8be4a02ea3ddfdfb1fa1999155f7 100644 +index 1ee13fb0518406382468af125253286996670ec6..f360f69256054b84cd5fc9094c5ff6833b5fa1b0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2667,6 +2667,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0877-Guard-against-invalid-entity-positions.patch b/patches/server/0878-Guard-against-invalid-entity-positions.patch similarity index 89% rename from patches/server/0877-Guard-against-invalid-entity-positions.patch rename to patches/server/0878-Guard-against-invalid-entity-positions.patch index a635100f1..b384b406a 100644 --- a/patches/server/0877-Guard-against-invalid-entity-positions.patch +++ b/patches/server/0878-Guard-against-invalid-entity-positions.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions Anything not finite should be blocked and logged diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 302c41a92ede8be4a02ea3ddfdfb1fa1999155f7..87644f9f8e7ee1f0e2745f0d1344b78e26581fe5 100644 +index f360f69256054b84cd5fc9094c5ff6833b5fa1b0..9d2cac140f939559eba9149ce13334f8f178c962 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4171,11 +4171,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -41,5 +41,5 @@ index 302c41a92ede8be4a02ea3ddfdfb1fa1999155f7..87644f9f8e7ee1f0e2745f0d1344b78e + } + // Paper end - block invalid positions // Paper end - if (this.position.x != x || this.position.y != y || this.position.z != z) { - synchronized (this.posLock) { // Paper + // Paper start - fix MC-4 + if (this instanceof ItemEntity) { diff --git a/patches/server/0878-cache-resource-keys.patch b/patches/server/0879-cache-resource-keys.patch similarity index 100% rename from patches/server/0878-cache-resource-keys.patch rename to patches/server/0879-cache-resource-keys.patch diff --git a/patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0880-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0879-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0880-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0881-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0880-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0881-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0882-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0881-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0882-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0883-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0882-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0883-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0884-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0883-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0884-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0885-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0884-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0885-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0886-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0885-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0886-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0887-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0886-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0887-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0887-WorldCreator-keepSpawnLoaded.patch b/patches/server/0888-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0887-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0888-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0889-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0888-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/server/0889-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0890-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0889-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0890-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0891-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0890-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0891-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0892-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0891-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0892-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0893-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0892-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0893-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0893-Add-PlayerStopUsingItemEvent.patch b/patches/server/0894-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0893-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0894-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0894-FallingBlock-auto-expire-setting.patch b/patches/server/0895-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0894-FallingBlock-auto-expire-setting.patch rename to patches/server/0895-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0895-Don-t-tick-markers.patch b/patches/server/0896-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0895-Don-t-tick-markers.patch rename to patches/server/0896-Don-t-tick-markers.patch diff --git a/patches/server/0896-Do-not-accept-invalid-client-settings.patch b/patches/server/0897-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0896-Do-not-accept-invalid-client-settings.patch rename to patches/server/0897-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0897-Add-support-for-Proxy-Protocol.patch b/patches/server/0898-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0897-Add-support-for-Proxy-Protocol.patch rename to patches/server/0898-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0899-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0898-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0899-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0900-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0899-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0900-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0901-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0900-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0901-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0902-Prevent-entity-loading-causing-async-lookups.patch similarity index 96% rename from patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0902-Prevent-entity-loading-causing-async-lookups.patch index 7ee45303d..5a4efc26d 100644 --- a/patches/server/0901-Prevent-entity-loading-causing-async-lookups.patch +++ b/patches/server/0902-Prevent-entity-loading-causing-async-lookups.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 87644f9f8e7ee1f0e2745f0d1344b78e26581fe5..ade1e37d20ef3021f73da6d1905cea76d3ff0aa7 100644 +index 9d2cac140f939559eba9149ce13334f8f178c962..41922c009f002a2ff27673743e29b32680961a14 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -782,6 +782,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0903-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0902-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0903-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0904-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0903-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0904-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0905-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0904-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0905-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0905-Dont-resent-entity-on-art-update.patch b/patches/server/0906-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0905-Dont-resent-entity-on-art-update.patch rename to patches/server/0906-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0906-Untrash-chat-handling.patch b/patches/server/0907-Untrash-chat-handling.patch similarity index 100% rename from patches/server/0906-Untrash-chat-handling.patch rename to patches/server/0907-Untrash-chat-handling.patch diff --git a/patches/server/0907-Add-missing-spawn-eggs.patch b/patches/server/0908-Add-missing-spawn-eggs.patch similarity index 100% rename from patches/server/0907-Add-missing-spawn-eggs.patch rename to patches/server/0908-Add-missing-spawn-eggs.patch diff --git a/patches/server/0908-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0909-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0908-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0909-Remove-invalid-signature-login-stacktrace.patch