diff --git a/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch b/patches/removed/0500-Fix-curing-zombie-villager-discount-exploit.patch similarity index 96% rename from patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/removed/0500-Fix-curing-zombie-villager-discount-exploit.patch index e659267ea0..cabbab29ff 100644 --- a/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch +++ b/patches/removed/0500-Fix-curing-zombie-villager-discount-exploit.patch @@ -7,6 +7,8 @@ This fixes the exploit used to gain absurd trading discounts with infecting and curing a villager on repeat by simply resetting the relevant part of the reputation when it is cured. +This patch has been removed, as MC-181190 was fixed by mojang in 23w31a. + diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java index f58be4e2529759cc64df2c70a69ef56eabbb762d..84cee8fb09f90424438de336f60d9388da1b39de 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index a099a9a322..d0e878423f 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -1254,10 +1254,10 @@ index 0000000000000000000000000000000000000000..9e8b8de907654050c51400286af971ca +} diff --git a/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java new file mode 100644 -index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7562ca350 +index 0000000000000000000000000000000000000000..351fbbc577556ebbd62222615801a96b7c115822 --- /dev/null +++ b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java -@@ -0,0 +1,77 @@ +@@ -0,0 +1,78 @@ +package io.papermc.paper.configuration; + +import org.spongepowered.configurate.NodePath; @@ -1310,7 +1310,8 @@ index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7 + path("use-async-lighting"), + path("tnt-explosion-volume"), + path("entities", "spawning", "despawn-ranges", "soft"), -+ path("entities", "spawning", "despawn-ranges", "hard") ++ path("entities", "spawning", "despawn-ranges", "hard"), ++ path("fixes", "fix-curing-zombie-villager-discount-exploit") + }; + + NodePath[] REMOVED_GLOBAL_PATHS = { @@ -1337,10 +1338,10 @@ index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7 +} diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java new file mode 100644 -index 0000000000000000000000000000000000000000..387a887d3aebb57da80bc36e36c2a7ea05cfd74f +index 0000000000000000000000000000000000000000..ed79d30f33b2674863b2d73b1abdb48433c33412 --- /dev/null +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -0,0 +1,539 @@ +@@ -0,0 +1,538 @@ +package io.papermc.paper.configuration; + +import com.google.common.collect.HashBasedTable; @@ -1779,7 +1780,6 @@ index 0000000000000000000000000000000000000000..387a887d3aebb57da80bc36e36c2a7ea + public boolean disableUnloadedChunkEnderpearlExploit = true; + public boolean preventTntFromMovingInWater = false; + public boolean splitOverstackedLoot = true; -+ public boolean fixCuringZombieVillagerDiscountExploit = true; + public IntOr.Disabled fallingBlockHeightNerf = IntOr.Disabled.DISABLED; + public IntOr.Disabled tntEntityHeightNerf = IntOr.Disabled.DISABLED; + } diff --git a/patches/server/0501-Limit-recipe-packets.patch b/patches/server/0500-Limit-recipe-packets.patch similarity index 96% rename from patches/server/0501-Limit-recipe-packets.patch rename to patches/server/0500-Limit-recipe-packets.patch index 77284ad6e1..4b41c6795a 100644 --- a/patches/server/0501-Limit-recipe-packets.patch +++ b/patches/server/0500-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d8174c67d31fa8b6730a80a8e2399eed5737f838..44dd71b7789a7e66a6d2a94c241b535a2f4cbb86 100644 +index e4c4984285162523285b19de2e0c81b076b9c33b..059d2521bb2b86ccafd4b51a014bc6822692d854 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0502-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0501-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0503-Player-Chunk-Load-Unload-Events.patch b/patches/server/0502-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0503-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0502-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0505-Expose-LivingEntity-hurt-direction.patch b/patches/server/0504-Expose-LivingEntity-hurt-direction.patch similarity index 89% rename from patches/server/0505-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0504-Expose-LivingEntity-hurt-direction.patch index e5c1724c82..4ff58cbd93 100644 --- a/patches/server/0505-Expose-LivingEntity-hurt-direction.patch +++ b/patches/server/0504-Expose-LivingEntity-hurt-direction.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 00d9dd5affd62ceb35bb783d6bcc9e1e600c0fb4..c44f8ed810b0c9a510d7e1c07987323a8a620ca4 100644 +index fb3f65feab6f5febf58be71f0b9b1a4381958f1d..6c498338d3918afb4f7ad5bac013f6dbb43594c2 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -183,7 +183,7 @@ public abstract class Player extends LivingEntity { @@ -18,7 +18,7 @@ index 00d9dd5affd62ceb35bb783d6bcc9e1e600c0fb4..c44f8ed810b0c9a510d7e1c07987323a public boolean affectsSpawning = true; // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 05d9a9968588381aaa3aeb06ef4d18fed4085229..c9f4f496a92ff8465a21f22f326dc025aa8bd169 100644 +index d41e37afeab1e8bb098c6ed012b10b113c4a4715..408c23c8310c464baebfb1f4adafe56a01645a5a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -126,6 +126,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -36,7 +36,7 @@ index 05d9a9968588381aaa3aeb06ef4d18fed4085229..c9f4f496a92ff8465a21f22f326dc025 public int getSleepTicks() { return this.getHandle().sleepCounter; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 66a4d3d3626e4382e07617d0af464e6fbd8a9427..a1e2d78fd9a57a59887419d356be8eab72045574 100644 +index a654f22a6c331cd69290b99e6c73f3ed611c58a5..810f06b3dc7148f9d71635981b3be79659fd0906 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -932,5 +932,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 91% rename from patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index 30dbaa1c3a..e2a2d2a3a3 100644 --- a/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e18e733cd13b7b69170a839e78341f3f339afa09..58ca3b4cbd2626e80f4474753508e8990311771e 100644 +index a19979dac60552791b7a8dd4920ba75b525340ca..826bb30bd0075bb7827c13e43c2a1ce7a814f0ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -302,6 +302,10 @@ public class CraftEventFactory { diff --git a/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 93% rename from patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch index d84f8bed22..429087e774 100644 --- a/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch +++ b/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not crash from invalid ingredient lists in diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java -index 629b79c6e59944994295768904c449733764cf99..3dfe2c483f76d0ba11674b3c4e05e33daebeedb5 100644 +index 66b7a2c9a7dc18a98bf2c3aac863a10cbc3ae9f9..73bc45000b5285ccf5b06e2f372d6c82bf843b82 100644 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java @@ -261,7 +261,11 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa diff --git a/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 99% rename from patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch index 456c819cfa..d4c042a0ed 100644 --- a/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch +++ b/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerTradeEvent and PlayerPurchaseEvent Co-authored-by: Alexander diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java -index 3dfe2c483f76d0ba11674b3c4e05e33daebeedb5..5119d070dbb04f5a4f9c2def526e33e15ca8573f 100644 +index 73bc45000b5285ccf5b06e2f372d6c82bf843b82..5a591c439c5cef6b7e7e6f836ab813cb4f29b08c 100644 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java @@ -137,11 +137,24 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa diff --git a/patches/server/0509-Implement-TargetHitEvent.patch b/patches/server/0508-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0509-Implement-TargetHitEvent.patch rename to patches/server/0508-Implement-TargetHitEvent.patch diff --git a/patches/server/0510-MC-4-Fix-item-position-desync.patch b/patches/server/0509-MC-4-Fix-item-position-desync.patch similarity index 96% rename from patches/server/0510-MC-4-Fix-item-position-desync.patch rename to patches/server/0509-MC-4-Fix-item-position-desync.patch index 3de6712684..dcbd1a97ed 100644 --- a/patches/server/0510-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0509-MC-4-Fix-item-position-desync.patch @@ -28,7 +28,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..33d9131e9c75ef23cd637f5d6c39a270 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 c35d22e4d54abcb16b7ec932729d2f177fd4a14b..3acaa05743373b818ba70a0229c6afe63bfd1a97 100644 +index 9068a9646a7e436a5a0d9ea9deb52b78a316ba4a..9d169d6504ee486127b22cd4e6429c4eb5b7ec0a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4248,6 +4248,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0511-Additional-Block-Material-API-s.patch b/patches/server/0510-Additional-Block-Material-API-s.patch similarity index 93% rename from patches/server/0511-Additional-Block-Material-API-s.patch rename to patches/server/0510-Additional-Block-Material-API-s.patch index 1526eefd6e..051b8a644d 100644 --- a/patches/server/0511-Additional-Block-Material-API-s.patch +++ b/patches/server/0510-Additional-Block-Material-API-s.patch @@ -9,7 +9,7 @@ process to do this in the Bukkit API Adds API for buildable, replaceable, burnable too. diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index ef1e77729b12a9ee0b13fa283f8200cc0c3968ce..4239fa3d992722bd1d9184bb5c33ce5c14010052 100644 +index 848f089e559e4feb67dea9148291f70460da9e9d..1d637f5be518a054767154296fb7905bdbc175ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -439,6 +439,25 @@ public class CraftBlock implements Block { diff --git a/patches/server/0512-Fix-harming-potion-dupe.patch b/patches/server/0511-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0512-Fix-harming-potion-dupe.patch rename to patches/server/0511-Fix-harming-potion-dupe.patch diff --git a/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0514-Cache-burn-durations.patch b/patches/server/0513-Cache-burn-durations.patch similarity index 100% rename from patches/server/0514-Cache-burn-durations.patch rename to patches/server/0513-Cache-burn-durations.patch diff --git a/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0519-Zombie-API-breaking-doors.patch b/patches/server/0518-Zombie-API-breaking-doors.patch similarity index 90% rename from patches/server/0519-Zombie-API-breaking-doors.patch rename to patches/server/0518-Zombie-API-breaking-doors.patch index da4c6d2dce..50bb6965cf 100644 --- a/patches/server/0519-Zombie-API-breaking-doors.patch +++ b/patches/server/0518-Zombie-API-breaking-doors.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Zombie API - breaking doors public net.minecraft.world.entity.monster.Zombie supportsBreakDoorGoal()Z diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java -index 1e303c3686e2fe4e05efe5a630dd2c1cb0f9edea..ed211b123354ece21dd8beae7192a26727f5124f 100644 +index 4412c913123f7521f449c98b60378e8d3b1671ce..46336111dcf62a29390e724b1879c84c697076e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java @@ -122,6 +122,11 @@ public class CraftZombie extends CraftMonster implements Zombie { diff --git a/patches/server/0520-Fix-nerfed-slime-when-splitting.patch b/patches/server/0519-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0520-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0519-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0521-Add-EntityLoadCrossbowEvent.patch b/patches/server/0520-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0521-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0520-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0522-Added-WorldGameRuleChangeEvent.patch b/patches/server/0521-Added-WorldGameRuleChangeEvent.patch similarity index 98% rename from patches/server/0522-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0521-Added-WorldGameRuleChangeEvent.patch index d6247847f5..f79f5393c5 100644 --- a/patches/server/0522-Added-WorldGameRuleChangeEvent.patch +++ b/patches/server/0521-Added-WorldGameRuleChangeEvent.patch @@ -64,7 +64,7 @@ index 6a1001cb708a7f779a801428d2b00fbcde888bc1..2e240ad721928a9a68370114ba61c218 public int get() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e0c3a5cf44a66d3df31871da57460bb648c8770b..31fda85d5da2cbf4af199fd2431b258592f14af4 100644 +index 56710af63bf432ab38c3a39ad3b734371bb429d7..9b4276290c99cbf9f618746d49746ee9b074744a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1846,8 +1846,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0523-Added-ServerResourcesReloadedEvent.patch b/patches/server/0522-Added-ServerResourcesReloadedEvent.patch similarity index 97% rename from patches/server/0523-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0522-Added-ServerResourcesReloadedEvent.patch index ae3f1de8c5..490a9f39f8 100644 --- a/patches/server/0523-Added-ServerResourcesReloadedEvent.patch +++ b/patches/server/0522-Added-ServerResourcesReloadedEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e01e32c66afbc0719e3c47cb61e2e205876da884..6301152b4b3297e6f764f8bccf7394986fc6c76f 100644 +index 331cc75f4802b7c6a2903d506e58d887ba15921d..27c7c696647271ffed345e339822526730a9523b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2009,7 +2009,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements Registry { diff --git a/patches/server/0534-Add-StructuresLocateEvent.patch b/patches/server/0533-Add-StructuresLocateEvent.patch similarity index 99% rename from patches/server/0534-Add-StructuresLocateEvent.patch rename to patches/server/0533-Add-StructuresLocateEvent.patch index 465e85a5f2..47d435b995 100644 --- a/patches/server/0534-Add-StructuresLocateEvent.patch +++ b/patches/server/0533-Add-StructuresLocateEvent.patch @@ -76,7 +76,7 @@ index 4da303d7e15496f04f0e27bfb613176bc2a72b76..3c7920721914588a3e7eaf1faff46f73 Map>> map = new Object2ObjectArrayMap(); Iterator iterator = structures.iterator(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java -index 2530b09e6fc04c67ec18fcf4f786098bdba63552..2c23b3b2c84f61b1c64ffe4f99c09299019cf9bf 100644 +index 004bfaa563d901e042bf31cfac2993188f1190ff..f527bfd1530e5605b80b05293b806530c3a96b7b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java @@ -63,6 +63,11 @@ public class CraftRegistry implements Registry { diff --git a/patches/server/0535-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0534-Collision-option-for-requiring-a-player-participant.patch similarity index 96% rename from patches/server/0535-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0534-Collision-option-for-requiring-a-player-participant.patch index efa1626720..09bc1189ea 100644 --- a/patches/server/0535-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0534-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 3acaa05743373b818ba70a0229c6afe63bfd1a97..6277b3a553a6fe65a11d678701cb4615ec3e3cc6 100644 +index 9d169d6504ee486127b22cd4e6429c4eb5b7ec0a..968d231c8f6762a2f6177897c3b5f24864d60152 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1927,6 +1927,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0538-Make-schedule-command-per-world.patch b/patches/server/0537-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0538-Make-schedule-command-per-world.patch rename to patches/server/0537-Make-schedule-command-per-world.patch diff --git a/patches/server/0539-Configurable-max-leash-distance.patch b/patches/server/0538-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0539-Configurable-max-leash-distance.patch rename to patches/server/0538-Configurable-max-leash-distance.patch diff --git a/patches/server/0540-Implement-BlockPreDispenseEvent.patch b/patches/server/0539-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0540-Implement-BlockPreDispenseEvent.patch rename to patches/server/0539-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch similarity index 89% rename from patches/server/0545-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0544-Reset-shield-blocking-on-dimension-change.patch index 8f6b89c32f..77d3f29709 100644 --- a/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9c74a7e1dc74873c16a0fc474de459ccec4d372d..1d7fe0e7d382d2f2aa5a38732cc6212d6c7a11e3 100644 +index bf637aae0dcd701dd31568b3c84851349c4c5a0a..86b870e8316d2c27861c85ee5a8f7ddd857e8297 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1242,6 +1242,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0546-add-DragonEggFormEvent.patch b/patches/server/0545-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0546-add-DragonEggFormEvent.patch rename to patches/server/0545-add-DragonEggFormEvent.patch diff --git a/patches/server/0547-EntityMoveEvent.patch b/patches/server/0546-EntityMoveEvent.patch similarity index 92% rename from patches/server/0547-EntityMoveEvent.patch rename to patches/server/0546-EntityMoveEvent.patch index d396303a91..1597623bc7 100644 --- a/patches/server/0547-EntityMoveEvent.patch +++ b/patches/server/0546-EntityMoveEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6301152b4b3297e6f764f8bccf7394986fc6c76f..e4a9d99e08d5ed033f20a916f791b9f989fa66fb 100644 +index 27c7c696647271ffed345e339822526730a9523b..ced37ae135b8b856665819a7b618f62f18bb0199 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1491,6 +1491,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 18a69ab85de7f23f5ff468307bf2669544eba8af..e0a94d75ddf5cc0988876e7438fbcc449c608d37 100644 +index d24520f3c11fb93c470ad021ba4bdc5f2db43ac4..1f4226e340f4987d48218d8f4012401272a6dcb3 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -29,7 +29,7 @@ index 18a69ab85de7f23f5ff468307bf2669544eba8af..e0a94d75ddf5cc0988876e7438fbcc44 final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date()); io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f767d1d98574fc847c495baee1bf369444443aad..d56c968a5af7358ec07ba44fa4c7e0dc0861c86a 100644 +index 7b68fd746338fadba2b3e9aee4df5fb965299f1a..002591d6cafd909783db95f000530d3b93a04ff6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3359,6 +3359,20 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 91% rename from patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch index db56e9f1a6..2019b707c1 100644 --- a/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e0a94d75ddf5cc0988876e7438fbcc449c608d37..0f59f5da41f3ab18148a7b44b0872632f03ad078 100644 +index 1f4226e340f4987d48218d8f4012401272a6dcb3..f6ee996e6d85e1ab886ffc941a4a8cc05857e4e0 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1654,6 +1654,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0549-Inline-shift-direction-fields.patch b/patches/server/0548-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0549-Inline-shift-direction-fields.patch rename to patches/server/0548-Inline-shift-direction-fields.patch diff --git a/patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 95% rename from patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch index e811b5c0a7..18e781092c 100644 --- a/patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f9628163c62d39b5ffc7139c110890fc1bccc223..9d49cdb3f40b4dada89001ba1b63963bc292bf46 100644 +index 5bc937175a00c836a3a855780e2b8fd9a0005c07..47ebaf72a087387f9832cfd83f748c8ef3e9c410 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -451,13 +451,30 @@ public class CraftEventFactory { diff --git a/patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 92% rename from patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch index a387813cdf..88e136bf5d 100644 --- a/patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch +++ b/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add getMainThreadExecutor to BukkitScheduler diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index addf3c442a085281a7ac06245ccd741f08ed7ccb..d7ce4971d9271dbeff4adb9d852e4e7bdf60bf03 100644 +index 806dc15cec7d0ec082a2d3e512cd84edfbe6d9bf..3ceb5d83be20183da907915f70ba9e64369373a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -651,4 +651,15 @@ public class CraftScheduler implements BukkitScheduler { diff --git a/patches/server/0552-living-entity-allow-attribute-registration.patch b/patches/server/0551-living-entity-allow-attribute-registration.patch similarity index 96% rename from patches/server/0552-living-entity-allow-attribute-registration.patch rename to patches/server/0551-living-entity-allow-attribute-registration.patch index 84f0585507..d9d31ae912 100644 --- a/patches/server/0552-living-entity-allow-attribute-registration.patch +++ b/patches/server/0551-living-entity-allow-attribute-registration.patch @@ -38,7 +38,7 @@ index ea48f1119a940056c37d1d203437bfbfdf13663b..a3f989fd1775adbb84d197c51e22c188 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index a1e2d78fd9a57a59887419d356be8eab72045574..fac638e0eab8c50e6afd0ceee6f9d051127221eb 100644 +index 810f06b3dc7148f9d71635981b3be79659fd0906..62700f1190bda9cb05514096e426eb3eeb87504c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -710,6 +710,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0553-fix-dead-slime-setSize-invincibility.patch b/patches/server/0552-fix-dead-slime-setSize-invincibility.patch similarity index 89% rename from patches/server/0553-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0552-fix-dead-slime-setSize-invincibility.patch index 82acef5e68..494e56127e 100644 --- a/patches/server/0553-fix-dead-slime-setSize-invincibility.patch +++ b/patches/server/0552-fix-dead-slime-setSize-invincibility.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix dead slime setSize invincibility diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java -index 9b219beb8922bf0701e538bcf874f0eb922f60bb..2b1211ee410a0246195053ad041eaa131f859bcd 100644 +index 3d9b7c0e128ea05bec5600c774e9685998b71cac..e48f7d1cbec4a2319745ba48a5d44ab9925214e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java @@ -16,7 +16,7 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy { diff --git a/patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0555-Expose-Tracked-Players.patch b/patches/server/0554-Expose-Tracked-Players.patch similarity index 92% rename from patches/server/0555-Expose-Tracked-Players.patch rename to patches/server/0554-Expose-Tracked-Players.patch index c2235d9c2f..d997a95f37 100644 --- a/patches/server/0555-Expose-Tracked-Players.patch +++ b/patches/server/0554-Expose-Tracked-Players.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index cacefccf15d68759ec26548ac1c10ee97e251ac4..a63fb984e905e51dc100eba30cbd71cac173ae22 100644 +index 505ab2218c87961fd8c616a130de5b5e2e597eb4..d270d9ca6f1dea0ad4e6a919b58b845eebf3dc87 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1368,5 +1368,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0556-Remove-streams-from-SensorNearest.patch b/patches/server/0555-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0556-Remove-streams-from-SensorNearest.patch rename to patches/server/0555-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0557-Improve-ServerGUI.patch b/patches/server/0556-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0557-Improve-ServerGUI.patch rename to patches/server/0556-Improve-ServerGUI.patch diff --git a/patches/server/0558-fix-converting-txt-to-json-file.patch b/patches/server/0557-fix-converting-txt-to-json-file.patch similarity index 94% rename from patches/server/0558-fix-converting-txt-to-json-file.patch rename to patches/server/0557-fix-converting-txt-to-json-file.patch index 948c7cb6e4..786852a5f5 100644 --- a/patches/server/0558-fix-converting-txt-to-json-file.patch +++ b/patches/server/0557-fix-converting-txt-to-json-file.patch @@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..935dac757280731bfeb0a8f033cbe315 this.saveUserBanList(); this.loadIpBanList(); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index a661f8a83d4e57ca48bbf28dc668f8ff5fd29c91..b8bdafb97d2ca46887206b0aa144ee0c851c205d 100644 +index 6d7095a62f30b18bc8fb8dbc5a0f3331980b7140..2546136ecfc94a8220932a04993ffa46380aba7e 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -198,6 +198,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -48,7 +48,7 @@ index a661f8a83d4e57ca48bbf28dc668f8ff5fd29c91..b8bdafb97d2ca46887206b0aa144ee0c if (!OldUsersConverter.serverReadyAfterUserconversion(this)) { return false; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index adc96e0c4f81375253b540a3b003a00e12888cbc..0958d43ae6a4ee42c944b72008d11c30262a732a 100644 +index 89d18ae87029b82beea5e1bd69580f54f600696f..8662ded9a7d7bf75dcec2c859f9e76d3d63a8b29 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -178,6 +178,7 @@ public abstract class PlayerList { diff --git a/patches/server/0559-Add-worldborder-events.patch b/patches/server/0558-Add-worldborder-events.patch similarity index 100% rename from patches/server/0559-Add-worldborder-events.patch rename to patches/server/0558-Add-worldborder-events.patch diff --git a/patches/server/0560-added-PlayerNameEntityEvent.patch b/patches/server/0559-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0560-added-PlayerNameEntityEvent.patch rename to patches/server/0559-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0561-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch similarity index 94% rename from patches/server/0561-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0560-Prevent-grindstones-from-overstacking-items.patch index dc68619ad1..896e20afba 100644 --- a/patches/server/0561-Prevent-grindstones-from-overstacking-items.patch +++ b/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent grindstones from overstacking items diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java -index 03d3edadf39d4871a332808458870ea9479669c4..b56766ff0e61691294b40ea8c2370940c0e8b640 100644 +index 811d7415ae843347da374d73b4edfe89642d518a..24187a7ce812cb83a9a736bec8dce9e68ccc0798 100644 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java @@ -198,13 +198,13 @@ public class GrindstoneMenu extends AbstractContainerMenu { diff --git a/patches/server/0562-Add-recipe-to-cook-events.patch b/patches/server/0561-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0562-Add-recipe-to-cook-events.patch rename to patches/server/0561-Add-recipe-to-cook-events.patch diff --git a/patches/server/0563-Add-Block-isValidTool.patch b/patches/server/0562-Add-Block-isValidTool.patch similarity index 88% rename from patches/server/0563-Add-Block-isValidTool.patch rename to patches/server/0562-Add-Block-isValidTool.patch index f28e5d98e0..ff5e330151 100644 --- a/patches/server/0563-Add-Block-isValidTool.patch +++ b/patches/server/0562-Add-Block-isValidTool.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Block#isValidTool diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 4239fa3d992722bd1d9184bb5c33ce5c14010052..5a6cc60d345dc146a2ce9bbd177b67a17bf5312b 100644 +index 1d637f5be518a054767154296fb7905bdbc175ec..a33e7114ac902ae66a31e0298e7c13af2d11b07c 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -692,5 +692,9 @@ public class CraftBlock implements Block { diff --git a/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0564-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0563-Allow-using-signs-inside-spawn-protection.patch index b5c3a124e5..4f612be1e2 100644 --- a/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 760d49347b94d5d971aaed5be5fef3471e9758e8..5505b15ce0b7891b4d9329a8f4f7b7c12057c9e8 100644 +index 95cc9134244eb226480969674201cd234a055964..a4f10823242f412ccfece093ed0986512131c4ba 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1725,7 +1725,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0565-Expand-world-key-API.patch b/patches/server/0564-Expand-world-key-API.patch similarity index 100% rename from patches/server/0565-Expand-world-key-API.patch rename to patches/server/0564-Expand-world-key-API.patch diff --git a/patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0567-Item-Rarity-API.patch b/patches/server/0566-Item-Rarity-API.patch similarity index 100% rename from patches/server/0567-Item-Rarity-API.patch rename to patches/server/0566-Item-Rarity-API.patch diff --git a/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch similarity index 92% rename from patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch index 5cc36baecf..7811bd17da 100644 --- a/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch +++ b/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch @@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro Closes #5036 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 0958d43ae6a4ee42c944b72008d11c30262a732a..248fd1ff7a09cad178a87cb0d9b3be6c9d2f1473 100644 +index 8662ded9a7d7bf75dcec2c859f9e76d3d63a8b29..690bb831c41a344b284c16f2c44954f652784bdb 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -578,6 +578,14 @@ public abstract class PlayerList { diff --git a/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch similarity index 92% rename from patches/server/0569-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0568-forced-whitelist-use-configurable-kick-message.patch index 6be6c5a54b..0d27e71091 100644 --- a/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch +++ b/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch @@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e4a9d99e08d5ed033f20a916f791b9f989fa66fb..6fbe95fea9faa830cde4ff8a8031d148223023e5 100644 +index ced37ae135b8b856665819a7b618f62f18bb0199..992aa1fa85f0b0240d317773be5086e64889996a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2148,7 +2148,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0.0F) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 11b44bf31cc0feae3c568bf100801633c0b34906..8d7e99a331b21f2efbb60936974395b9c12ad5d6 100644 +index b4b1678edb87269aa35ab07c0d91d067ca9b0097..2726c54dc57e584352fde31f1638b0d1416b14ad 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -764,6 +764,12 @@ public abstract class PlayerList { diff --git a/patches/server/0588-Add-Channel-initialization-listeners.patch b/patches/server/0587-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0588-Add-Channel-initialization-listeners.patch rename to patches/server/0587-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0590-Add-more-WanderingTrader-API.patch b/patches/server/0589-Add-more-WanderingTrader-API.patch similarity index 94% rename from patches/server/0590-Add-more-WanderingTrader-API.patch rename to patches/server/0589-Add-more-WanderingTrader-API.patch index 5205274499..e7542c5ef9 100644 --- a/patches/server/0590-Add-more-WanderingTrader-API.patch +++ b/patches/server/0589-Add-more-WanderingTrader-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add more WanderingTrader API diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 5ea5f424c55f60bf63d3a4d3fe51362939f42f4c..1cef116b692ebdf3ade01cde533d1e5182a05a91 100644 +index 0321b4bb622930bfe57661b0e6b893d7635668fb..96115fe8a8c32ce5992d779b5db540b9d81e3b82 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java @@ -60,6 +60,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill @@ -33,7 +33,7 @@ index 5ea5f424c55f60bf63d3a4d3fe51362939f42f4c..1cef116b692ebdf3ade01cde533d1e51 this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this)); this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D)); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java -index 758eb33c565999e6321b96ff0f733478ffbbd9cc..4a6700d7d2f40cf516054e2e3d09049f1ce4fd17 100644 +index 08194a78c2170e971ee8ff440b276ed3590e8c4a..0e597394a3dd08f022614fc9777302fea581eb55 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java @@ -28,4 +28,26 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande diff --git a/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch similarity index 89% rename from patches/server/0591-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0590-Add-EntityBlockStorage-clearEntities.patch index 2ff1e7a041..0488f4f727 100644 --- a/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch +++ b/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityBlockStorage#clearEntities() diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -index ea63802f2644bc2b5b3b0c72d7d09813cb68139d..82ad97800cb115cc4830337a59cc4608c1d4a7a0 100644 +index 5c89d824ef43792c34c9f2df5851ba8af503cbd9..9d4152f9fde93a832f263c793955d327f1e078f7 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java @@ -139,6 +139,11 @@ public class BeehiveBlockEntity extends BlockEntity { @@ -21,7 +21,7 @@ index ea63802f2644bc2b5b3b0c72d7d09813cb68139d..82ad97800cb115cc4830337a59cc4608 return (Integer) state.getValue(BeehiveBlock.HONEY_LEVEL); } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java -index d01aa63f97da4cc31c385325809911e79d012d40..2b906fccdb0a5ecddaf487ee931d05b511f84351 100644 +index 54fd63a9293c9d6a444a184be1dc08e4bd948a10..2e51fab98d95c93d2095f7be6dbb5d5474158bfb 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java @@ -90,4 +90,11 @@ public class CraftBeehive extends CraftBlockEntityState impl diff --git a/patches/server/0592-Entity-load-save-limit-per-chunk.patch b/patches/server/0591-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0592-Entity-load-save-limit-per-chunk.patch rename to patches/server/0591-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 95% rename from patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch index 6db9d8af69..87bbcb36ba 100644 --- a/patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch +++ b/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 7ae0ecc93a92edeb172d9ed0709c8f7f068cdf4e..2580e8e37cee802aa4f8f3ca5df2cc4914e28daf 100644 +index 97e91910c2c30b4f838e78794c9107bdfe8d7668..b52c4d659fa4ea1a9119f932a381c4982f158deb 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -289,12 +289,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0595-Inventory-close.patch b/patches/server/0594-Inventory-close.patch similarity index 100% rename from patches/server/0595-Inventory-close.patch rename to patches/server/0594-Inventory-close.patch diff --git a/patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0597-Add-basic-Datapack-API.patch b/patches/server/0596-Add-basic-Datapack-API.patch similarity index 98% rename from patches/server/0597-Add-basic-Datapack-API.patch rename to patches/server/0596-Add-basic-Datapack-API.patch index f18457ab30..39820340b7 100644 --- a/patches/server/0597-Add-basic-Datapack-API.patch +++ b/patches/server/0596-Add-basic-Datapack-API.patch @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e57af8c8f4a1ddfcf9689c8d721b2e2dc887f0be..23a433f28a7185c86c129deec32b606079c13f9c 100644 +index 44d74515165f1ebce5fb5c875ba9c4a53eab9980..2bc30c803b311ac57323b4531556e4f5effb4437 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -303,6 +303,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0598-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0598-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0597-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0600-ItemStack-repair-check-API.patch b/patches/server/0599-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0600-ItemStack-repair-check-API.patch rename to patches/server/0599-ItemStack-repair-check-API.patch diff --git a/patches/server/0601-More-Enchantment-API.patch b/patches/server/0600-More-Enchantment-API.patch similarity index 97% rename from patches/server/0601-More-Enchantment-API.patch rename to patches/server/0600-More-Enchantment-API.patch index a065d8b7e3..fc96204583 100644 --- a/patches/server/0601-More-Enchantment-API.patch +++ b/patches/server/0600-More-Enchantment-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] More Enchantment API public net.minecraft.world.item.enchantment.Enchantment slots diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java -index 57decf4156f176ebcc988478c17856cbc555c5e4..3d0ce0803e1da8a2681a3cb41096ac942ece54a1 100644 +index 5b09e7e08c61b10044ac5f481bf10bb79feda8a3..06a857ae432fc81737b53a6d2b8742c1e80e5f8a 100644 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java @@ -71,7 +71,7 @@ public class CraftEnchantment extends Enchantment { @@ -66,7 +66,7 @@ index 57decf4156f176ebcc988478c17856cbc555c5e4..3d0ce0803e1da8a2681a3cb41096ac94 public net.minecraft.world.item.enchantment.Enchantment getHandle() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index fac638e0eab8c50e6afd0ceee6f9d051127221eb..65f516044128328e7729c971a4a299cc81d51b0a 100644 +index 62700f1190bda9cb05514096e426eb3eeb87504c..3d3f7198a6134ced5c2dd25e369cb4e8d8f45fd1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -949,5 +949,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0602-Move-range-check-for-block-placing-up.patch b/patches/server/0601-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0602-Move-range-check-for-block-placing-up.patch rename to patches/server/0601-Move-range-check-for-block-placing-up.patch index 64a3d3d2b1..4553cc1ba0 100644 --- a/patches/server/0602-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0601-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3ad46fcf6706b41fde42abe4e008c5bc86def07c..37e78cda4a41efa4b82fb3c6293bb12597d6e720 100644 +index bca39612af8c9bed1e97697c42825fb7f128197c..ef66cd1bac6f80120c14c884d4de5036a3d1d9cc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1711,6 +1711,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0603-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0602-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0604-Add-Mob-lookAt-API.patch b/patches/server/0603-Add-Mob-lookAt-API.patch similarity index 97% rename from patches/server/0604-Add-Mob-lookAt-API.patch rename to patches/server/0603-Add-Mob-lookAt-API.patch index b60d6b1767..1215b07374 100644 --- a/patches/server/0604-Add-Mob-lookAt-API.patch +++ b/patches/server/0603-Add-Mob-lookAt-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Mob#lookAt API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 522b7cb1db22b02279b004916ad2a14447a6bbed..c90f9b519c82327b787d2920b3bb079efb0c7e8a 100644 +index 74843d1fa344497d35f05d0b04f650edd1e0f3a1..6152f4d3d58f4b598d5bd92dbd7c5428c5ff8bc5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -99,5 +99,53 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { diff --git a/patches/server/0605-Add-Unix-domain-socket-support.patch b/patches/server/0604-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0605-Add-Unix-domain-socket-support.patch rename to patches/server/0604-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0606-Add-EntityInsideBlockEvent.patch b/patches/server/0605-Add-EntityInsideBlockEvent.patch similarity index 99% rename from patches/server/0606-Add-EntityInsideBlockEvent.patch rename to patches/server/0605-Add-EntityInsideBlockEvent.patch index aef98d33da..ca5eb3ba9f 100644 --- a/patches/server/0606-Add-EntityInsideBlockEvent.patch +++ b/patches/server/0605-Add-EntityInsideBlockEvent.patch @@ -53,7 +53,7 @@ index 42265fa901aeb2bb7a564cc94162a938208c1f90..ed36a378b79f62c3dce3da637a337595 if (blockState.isAir()) { entity.onAboveBubbleCol(state.getValue(DRAG_DOWN)); diff --git a/src/main/java/net/minecraft/world/level/block/ButtonBlock.java b/src/main/java/net/minecraft/world/level/block/ButtonBlock.java -index d35618520daafb50de747f6bc200160ea17ef656..3e792514d042f05ff6848b7d6506472ace67b67a 100644 +index 56d5229dc4654fc9b2f50aee094cb595b49bcf44..a387246aeb5e03d9c5bac52b51180ae8fcfb1528 100644 --- a/src/main/java/net/minecraft/world/level/block/ButtonBlock.java +++ b/src/main/java/net/minecraft/world/level/block/ButtonBlock.java @@ -181,6 +181,7 @@ public class ButtonBlock extends FaceAttachedHorizontalDirectionalBlock { @@ -233,7 +233,7 @@ index 89c86d10840bc8fa73465a6a548c48fab9ac55ea..34eb7ba1adb51e394bf46a6f643db352 entity.makeStuckInBlock(state, new Vec3(0.800000011920929D, 0.75D, 0.800000011920929D)); if (!world.isClientSide && (Integer) state.getValue(SweetBerryBushBlock.AGE) > 0 && (entity.xOld != entity.getX() || entity.zOld != entity.getZ())) { diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java -index 5e1133bf2cba55a6ec5559d8db41e1a3db582d06..4e2fb4ee8e46b3c363992ff23e26f5a648c5f003 100644 +index 5aa0653b85784ece5fe09ace5c63d2c91469c823..336ffc27ea75fd8fd037c20b931233dc611084f3 100644 --- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java @@ -121,6 +121,7 @@ public class TripWireBlock extends Block { diff --git a/patches/server/0607-Attributes-API-for-item-defaults.patch b/patches/server/0606-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0607-Attributes-API-for-item-defaults.patch rename to patches/server/0606-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0609-More-Lidded-Block-API.patch b/patches/server/0608-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0609-More-Lidded-Block-API.patch rename to patches/server/0608-More-Lidded-Block-API.patch diff --git a/patches/server/0610-Limit-item-frame-cursors-on-maps.patch b/patches/server/0609-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0610-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0609-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0611-Add-PlayerKickEvent-causes.patch b/patches/server/0610-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0611-Add-PlayerKickEvent-causes.patch rename to patches/server/0610-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0612-Add-PufferFishStateChangeEvent.patch b/patches/server/0611-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0612-Add-PufferFishStateChangeEvent.patch rename to patches/server/0611-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0616-Add-BellRevealRaiderEvent.patch b/patches/server/0615-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0616-Add-BellRevealRaiderEvent.patch rename to patches/server/0615-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0617-Fix-invulnerable-end-crystals.patch b/patches/server/0616-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0617-Fix-invulnerable-end-crystals.patch rename to patches/server/0616-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0618-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0618-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0617-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0619-Fix-dangerous-end-portal-logic.patch b/patches/server/0618-Fix-dangerous-end-portal-logic.patch similarity index 97% rename from patches/server/0619-Fix-dangerous-end-portal-logic.patch rename to patches/server/0618-Fix-dangerous-end-portal-logic.patch index 0fc1eef84c..d83d8296e1 100644 --- a/patches/server/0619-Fix-dangerous-end-portal-logic.patch +++ b/patches/server/0618-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 6277b3a553a6fe65a11d678701cb4615ec3e3cc6..ec6b9781ea95057a202f9ff31cacdb7215923458 100644 +index 968d231c8f6762a2f6177897c3b5f24864d60152..bbd071009d9ccf84f4c4ade296c98a8f4d6ac3ae 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -485,6 +485,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0621-Make-item-validations-configurable.patch b/patches/server/0620-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0621-Make-item-validations-configurable.patch rename to patches/server/0620-Make-item-validations-configurable.patch diff --git a/patches/server/0622-Line-Of-Sight-Changes.patch b/patches/server/0621-Line-Of-Sight-Changes.patch similarity index 95% rename from patches/server/0622-Line-Of-Sight-Changes.patch rename to patches/server/0621-Line-Of-Sight-Changes.patch index 348480b8db..ba904ef595 100644 --- a/patches/server/0622-Line-Of-Sight-Changes.patch +++ b/patches/server/0621-Line-Of-Sight-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b2a5b9c7502af235e7f31ffa45c0f4d501a5f459..fd910b23f4f761a8a1ca3da12a114d9138753f20 100644 +index 9ce8052369e3279a89b55b56c476c1e1405c6570..1c8742e272e984d9a093d049b9420036ffc284a1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3604,7 +3604,8 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -45,7 +45,7 @@ index 0e8cf9386fa8b869e3738ac408be2dc86b9a2d9b..c3a26a55f46737a470448c6554d6827b // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 65f516044128328e7729c971a4a299cc81d51b0a..7876e243d6389bdfc33a5bf7e18eb3b33256919b 100644 +index 3d3f7198a6134ced5c2dd25e369cb4e8d8f45fd1..7745c32b312a7f91e6919ccfb0871d765d0e06f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -583,6 +583,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0623-add-per-world-spawn-limits.patch b/patches/server/0622-add-per-world-spawn-limits.patch similarity index 91% rename from patches/server/0623-add-per-world-spawn-limits.patch rename to patches/server/0622-add-per-world-spawn-limits.patch index a8352ed49b..5a0bee4c61 100644 --- a/patches/server/0623-add-per-world-spawn-limits.patch +++ b/patches/server/0622-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f74b030ead0aa5227adbc23f789756bd08f99931..0103f937e31b7e7b9af846ec80046654c80669df 100644 +index a50a9f239ef27807d876aca9b18fbbb1dfbb14fa..b69c0e32965b3ed5b3e41d7cdee6f07b572d2b7c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -213,6 +213,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0624-Fix-potions-splash-events.patch b/patches/server/0623-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0624-Fix-potions-splash-events.patch rename to patches/server/0623-Fix-potions-splash-events.patch diff --git a/patches/server/0625-Add-more-LimitedRegion-API.patch b/patches/server/0624-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0625-Add-more-LimitedRegion-API.patch rename to patches/server/0624-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0627-Missing-Entity-API.patch b/patches/server/0626-Missing-Entity-API.patch similarity index 100% rename from patches/server/0627-Missing-Entity-API.patch rename to patches/server/0626-Missing-Entity-API.patch diff --git a/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch index bf3b5d3599..6d154d7e68 100644 --- a/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9cd00fce9dadd65020de9c48524416d6d3c82bc4..e084a66544a91cad162b1c9abb4b8f6b982992d7 100644 +index 7f030cac8b3bc7d2d4b1c32ef5edc360473881f2..a1de622805f31e6de771b62cce94ad78dd8a526f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1095,7 +1095,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 90% rename from patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch index 62c862fdb8..46818e51e6 100644 --- a/patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch +++ b/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix return value of Block#applyBoneMeal always being false diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 5a6cc60d345dc146a2ce9bbd177b67a17bf5312b..4c4e242305edf7b8bfa6761cd7e8c9498982608c 100644 +index a33e7114ac902ae66a31e0298e7c13af2d11b07c..29be71311755de77ce854f874b1fe2b093b997cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -557,7 +557,7 @@ public class CraftBlock implements Block { diff --git a/patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 94% rename from patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch index f9e82eef32..4bdc40acc5 100644 --- a/patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch @@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk load in that case). diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 508b18f5e7dd6240a680e73be639d0cf9e4e5d07..31d30840ec0acfd0d666163f77c8deb0efced922 100644 +index 61b8ec1ba224551f6898f3e2abbb67992dbb7001..eb4ad9cfd2291b01fd09be2114b56502149fe049 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -228,7 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -21,7 +21,7 @@ index 508b18f5e7dd6240a680e73be639d0cf9e4e5d07..31d30840ec0acfd0d666163f77c8deb0 @Override diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 51dc136b9a5006382de4b12275a9c2f299d5d1f9..7113fdf06bc526af62d08313f8c47e14a2f4b652 100644 +index b3833da06ec8882f09b01fc596eafe519f0873c1..eea2b7f9c566b5a21fa7da7d1321469a12c45b5a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -201,6 +201,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0632-Adds-PlayerArmSwingEvent.patch b/patches/server/0631-Adds-PlayerArmSwingEvent.patch similarity index 93% rename from patches/server/0632-Adds-PlayerArmSwingEvent.patch rename to patches/server/0631-Adds-PlayerArmSwingEvent.patch index 318be80dc4..5aef5fc4e8 100644 --- a/patches/server/0632-Adds-PlayerArmSwingEvent.patch +++ b/patches/server/0631-Adds-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e084a66544a91cad162b1c9abb4b8f6b982992d7..7f94c6022f5889f47bdce98b3c8c95da53581a24 100644 +index a1de622805f31e6de771b62cce94ad78dd8a526f..c38d6ff1c4b22833ce8c99ec420741659becf4d2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2317,7 +2317,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 95% rename from patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch index 420b8af167..270f37cb14 100644 --- a/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 963af930dc40b30d84c1e5d46be752ef74908a8a..d20fbe3c03e794bee0c29e251aba223953cfed15 100644 +index aa2185e46bd47748a0a2b092ab2caf134fa4fa69..a3672049abc81fa4d34443cf0303d23e0f86b284 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -266,7 +266,6 @@ public class ServerPlayer extends Player { @@ -17,7 +17,7 @@ index 963af930dc40b30d84c1e5d46be752ef74908a8a..d20fbe3c03e794bee0c29e251aba2239 public boolean isRealPlayer; // Paper public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 125a9d1ae394db4b0d5418756d50e32feca83344..20122bf191ebc74c223310aea1f004fdbb163e57 100644 +index a0328cfbe4184a2c1dc895e96fa3fefbdc52bf09..598f807f0d0caac98b81e0e2991f1bd497c4534e 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -76,6 +76,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -50,7 +50,7 @@ index 125a9d1ae394db4b0d5418756d50e32feca83344..20122bf191ebc74c223310aea1f004fd MinecraftServer minecraftserver = this.server; Connection networkmanager = this.connection; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7f94c6022f5889f47bdce98b3c8c95da53581a24..a6886bc4dd06675b6fc3b28d4611842b0fa4e411 100644 +index c38d6ff1c4b22833ce8c99ec420741659becf4d2..eabdaf85e904224f936154d415d183ba65e4dbbf 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1855,6 +1855,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -96,7 +96,7 @@ index 7f94c6022f5889f47bdce98b3c8c95da53581a24..a6886bc4dd06675b6fc3b28d4611842b this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false); // Paper end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 9a1f1548b7f095946edb105ddfd64932bf64a2df..14f3873d4bf43d5576a4c93b80d8a97841b23355 100644 +index 0139313fb1b06da9df19317748862700c1b5b6e9..e9b012889987d3c0fca2c90a4edee36b2c86cb88 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -551,6 +551,11 @@ public abstract class PlayerList { diff --git a/patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch similarity index 97% rename from patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch index be1d9fc586..6f53f12f33 100644 --- a/patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c46e543cfe8fa5cef2e09c72b0cf82f66359482a..3ece54f48b1cda01a04d6b943e2b10a9ad8c2af5 100644 +index 1c8742e272e984d9a093d049b9420036ffc284a1..118f1c6a349ad49d87f14a1b8ae9ef64ccb1148a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1165,7 +1165,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0635-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch similarity index 94% rename from patches/server/0635-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0634-Fix-incorrect-message-for-outdated-client.patch index 3c1d877b05..c668a16be5 100644 --- a/patches/server/0635-Fix-incorrect-message-for-outdated-client.patch +++ b/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix incorrect message for outdated client diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java -index ae6efc0b8fe1787300a4c6d223dfe48df861ecc6..73f12e176acc0a035d3283cf5ecebcb1b8b06b73 100644 +index 0b3d6b309ea653d44bcfcd6dd418f692e040c87b..c6bcf4a5d5c48e6f73b8e5d3662ec0d7c288c6c8 100644 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java @@ -82,7 +82,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL diff --git a/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch similarity index 94% rename from patches/server/0636-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0635-Don-t-apply-cramming-damage-to-players.patch index 2548874b36..99113340f6 100644 --- a/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d20fbe3c03e794bee0c29e251aba223953cfed15..47e7bc46d349e0f0000676948a5c251f555abeb1 100644 +index a3672049abc81fa4d34443cf0303d23e0f86b284..00adb106eea35b745e98e28e6b9e0affe2d00651 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -95,6 +95,7 @@ import net.minecraft.util.Mth; diff --git a/patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0639-Stinger-API.patch b/patches/server/0638-Stinger-API.patch similarity index 93% rename from patches/server/0639-Stinger-API.patch rename to patches/server/0638-Stinger-API.patch index 9e8f26a8d2..a7104402ba 100644 --- a/patches/server/0639-Stinger-API.patch +++ b/patches/server/0638-Stinger-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 7876e243d6389bdfc33a5bf7e18eb3b33256919b..59d0002c70e2dae6ab9cb896e0a80e16993e64f3 100644 +index 7745c32b312a7f91e6919ccfb0871d765d0e06f3..886f9b0a4cb4bd6d7341a1ea707565c4492f31d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -338,7 +338,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 95% rename from patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch index 5f8b5b11ed..d3cf90c2af 100644 --- a/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch +++ b/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch @@ -18,7 +18,7 @@ index 53515854d05a0c27a65f71193424236a21b11f5f..c368b437597edf7e165326727ae778a6 public static int createNewSavedData(Level world, int x, int z, int scale, boolean showIcons, boolean unlimitedTracking, ResourceKey dimension) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java -index 70b365afc40f11d4da3aea2b5d6b2467f517deac..a74ea06e3a190916527ab2c85d13f1e34c08d50a 100644 +index 0c7280621cce9855dcc9569e0aefba77bfd555cb..0c7c67e1eea44487c52ebf650d35b3b43cd00c3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java @@ -133,6 +133,7 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta { diff --git a/patches/server/0641-Add-System.out-err-catcher.patch b/patches/server/0640-Add-System.out-err-catcher.patch similarity index 98% rename from patches/server/0641-Add-System.out-err-catcher.patch rename to patches/server/0640-Add-System.out-err-catcher.patch index 1f11b3d41a..6fd5f26dc3 100644 --- a/patches/server/0641-Add-System.out-err-catcher.patch +++ b/patches/server/0640-Add-System.out-err-catcher.patch @@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ab1c96a6d7e0d3f8bb651936256e9a66badf3355..2a5daa15b1095b20716e997c18fe68ac7d550da6 100644 +index 6a860029247e1575329975060fb9c2d7e8c9f033..675788beea6c9559d5764501e76d671abcba3f17 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -305,6 +305,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0643-Improve-boat-collision-performance.patch b/patches/server/0642-Improve-boat-collision-performance.patch similarity index 97% rename from patches/server/0643-Improve-boat-collision-performance.patch rename to patches/server/0642-Improve-boat-collision-performance.patch index 92f123e9ce..30906bd16a 100644 --- a/patches/server/0643-Improve-boat-collision-performance.patch +++ b/patches/server/0642-Improve-boat-collision-performance.patch @@ -17,7 +17,7 @@ index 5e9401f0c2de0743aca9237ee8c4dfba586cfdb9..25b2d7016b60ee9bad0a2fb4a2c7c8ee }; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8ce2eae72048701f02026fc5309b406005900694..705a76c73233a29105f5cb2e50d4d200376a4c60 100644 +index 118f1c6a349ad49d87f14a1b8ae9ef64ccb1148a..eca3c85b2b24a59b6c3b316e2535f2a4354f50f9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1414,7 +1414,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch index 4f88cce17e..f97c806cf2 100644 --- a/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a6886bc4dd06675b6fc3b28d4611842b0fa4e411..2f3fddf5427248c3283173afaed220f7a3fd9e31 100644 +index eabdaf85e904224f936154d415d183ba65e4dbbf..43e9f9ce338bd1cf803ad707d318cd2435231426 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -388,7 +388,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0646-Add-PlayerSetSpawnEvent.patch b/patches/server/0645-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0646-Add-PlayerSetSpawnEvent.patch rename to patches/server/0645-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0648-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0648-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0647-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0649-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0649-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0648-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0650-Added-EntityDamageItemEvent.patch b/patches/server/0649-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0650-Added-EntityDamageItemEvent.patch rename to patches/server/0649-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0651-Optimize-indirect-passenger-iteration.patch b/patches/server/0650-Optimize-indirect-passenger-iteration.patch similarity index 96% rename from patches/server/0651-Optimize-indirect-passenger-iteration.patch rename to patches/server/0650-Optimize-indirect-passenger-iteration.patch index 936797269e..a3a4dcc84e 100644 --- a/patches/server/0651-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0650-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 ec6b9781ea95057a202f9ff31cacdb7215923458..7812a23c779d4555caddd747f7ad8d96e6f08797 100644 +index bbd071009d9ccf84f4c4ade296c98a8f4d6ac3ae..cfc9732378772084cd0badabaccd3de934b39596 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3909,20 +3909,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0653-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0653-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0652-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0654-Clear-bucket-NBT-after-dispense.patch b/patches/server/0653-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0654-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0653-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0656-Add-BlockBreakBlockEvent.patch b/patches/server/0655-Add-BlockBreakBlockEvent.patch similarity index 98% rename from patches/server/0656-Add-BlockBreakBlockEvent.patch rename to patches/server/0655-Add-BlockBreakBlockEvent.patch index 2fd4cd307f..52a9d63ddc 100644 --- a/patches/server/0656-Add-BlockBreakBlockEvent.patch +++ b/patches/server/0655-Add-BlockBreakBlockEvent.patch @@ -33,7 +33,7 @@ index 36b196c8834c4eb873bfca0b12f1fc2b421ea071..9522e646529f3d849471931b4b3c0d13 public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) { if (world instanceof ServerLevel) { diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java -index 48ee146dea30f7d8c48c6bee7a1547ad2a69959d..195a08045d6705a47efa918fa0d3882ee9073ab4 100644 +index 929241e479a42011f073fb9d144739b6504132b1..b9896fd8e96a908637ce1edf9413166192903ce7 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java @@ -402,7 +402,7 @@ public class PistonBaseBlock extends DirectionalBlock { diff --git a/patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0658-More-CommandBlock-API.patch b/patches/server/0657-More-CommandBlock-API.patch similarity index 95% rename from patches/server/0658-More-CommandBlock-API.patch rename to patches/server/0657-More-CommandBlock-API.patch index 162a84f2e6..65a5093980 100644 --- a/patches/server/0658-More-CommandBlock-API.patch +++ b/patches/server/0657-More-CommandBlock-API.patch @@ -44,7 +44,7 @@ index 0000000000000000000000000000000000000000..0b42306f17bf8850a13a51067c2d19e7 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java -index bdd0647d683565088e5cfcd43fb26f4b776db338..42c39c91d2b8e2bc32592adb8813f8a13936f34a 100644 +index 7f5d930b6bfaf9a0042f9be4be68f2cc111b304e..63f6b97d82c8b98eb1379b5c30f6c75eb22f7c23 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java @@ -5,7 +5,7 @@ import org.bukkit.World; @@ -68,7 +68,7 @@ index bdd0647d683565088e5cfcd43fb26f4b776db338..42c39c91d2b8e2bc32592adb8813f8a1 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java -index 66fb6aeb49b7e93d2a4d9b5ce7f1a7d68f571cf5..2534abcdce426189ac15e0659ab62840b3d54762 100644 +index 92e21126a9347f1ee2279ab09bb6abf2344ad2e2..0ee159d488b15e571f9b19ec852fe279755696fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java @@ -13,7 +13,7 @@ import org.bukkit.permissions.PermissionAttachment; diff --git a/patches/server/0659-Add-missing-team-sidebar-display-slots.patch b/patches/server/0658-Add-missing-team-sidebar-display-slots.patch similarity index 98% rename from patches/server/0659-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0658-Add-missing-team-sidebar-display-slots.patch index a9c7a8fa5b..446d882c45 100644 --- a/patches/server/0659-Add-missing-team-sidebar-display-slots.patch +++ b/patches/server/0658-Add-missing-team-sidebar-display-slots.patch @@ -52,7 +52,7 @@ index 73c5ffff70605b32188a9bb5fb6c0ee04cb66efe..711d227f5ee6d63356a94a0567968da4 } diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index cfaa85dc3d567bf0110e45fc4e4f24a406b41a45..313cd180cbad5727433daae4c15ffa4e1e948eaa 100644 +index 12972cf5876da72cc5d097aeedb13c9addd98add..e0c1131687fffd7f215505caafe6ef2292ac8672 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -239,6 +239,14 @@ public class Commodore diff --git a/patches/server/0660-Add-back-EntityPortalExitEvent.patch b/patches/server/0659-Add-back-EntityPortalExitEvent.patch similarity index 97% rename from patches/server/0660-Add-back-EntityPortalExitEvent.patch rename to patches/server/0659-Add-back-EntityPortalExitEvent.patch index 020d493778..fa64daa44d 100644 --- a/patches/server/0660-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0659-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 7812a23c779d4555caddd747f7ad8d96e6f08797..406b2cf18466439f7984497cf5da2bef466de459 100644 +index cfc9732378772084cd0badabaccd3de934b39596..0dcc94b713593a298f09d489780f38298d5f4cc5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3365,6 +3365,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0662-Get-entity-default-attributes.patch b/patches/server/0661-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0662-Get-entity-default-attributes.patch rename to patches/server/0661-Get-entity-default-attributes.patch diff --git a/patches/server/0663-Left-handed-API.patch b/patches/server/0662-Left-handed-API.patch similarity index 90% rename from patches/server/0663-Left-handed-API.patch rename to patches/server/0662-Left-handed-API.patch index 367c9ed9bc..e75eb9ca95 100644 --- a/patches/server/0663-Left-handed-API.patch +++ b/patches/server/0662-Left-handed-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Left handed API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index c90f9b519c82327b787d2920b3bb079efb0c7e8a..c526304d31fd9be1b3c895187f7d9fc45edf4866 100644 +index 6152f4d3d58f4b598d5bd92dbd7c5428c5ff8bc5..40d277f2737f1a060c3047313289c73307948e73 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -147,5 +147,15 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { diff --git a/patches/server/0664-Add-more-advancement-API.patch b/patches/server/0663-Add-more-advancement-API.patch similarity index 99% rename from patches/server/0664-Add-more-advancement-API.patch rename to patches/server/0663-Add-more-advancement-API.patch index ba79527126..c7966b2e3e 100644 --- a/patches/server/0664-Add-more-advancement-API.patch +++ b/patches/server/0663-Add-more-advancement-API.patch @@ -164,7 +164,7 @@ index 4aa8cda2bf72627b153e636a408fb3971caf2309..e29d7c6e1cef10a76c8630855fada11c private final DisplayInfo handle; diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 313cd180cbad5727433daae4c15ffa4e1e948eaa..8f8b14cb845bf1ba28276b3e3c0d8f8c56106c7d 100644 +index e0c1131687fffd7f215505caafe6ef2292ac8672..51e60a68484b590906d83541e56f31305e683bc0 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -56,6 +56,7 @@ public class Commodore diff --git a/patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch similarity index 97% rename from patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch index ed29983bdd..4fd7a361e7 100644 --- a/patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch +++ b/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch @@ -29,7 +29,7 @@ index aa90b0bc1ca3f79a38b39442bf87e376cd2d73ae..48a88dae70fdf2757537d4a90aa60046 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 8f8b14cb845bf1ba28276b3e3c0d8f8c56106c7d..d7495ea25713e959d106764054ce6642af497035 100644 +index 51e60a68484b590906d83541e56f31305e683bc0..1f30da05f0dd1d0f67ff7ec544e8f8455e2ef516 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -461,6 +461,16 @@ public class Commodore diff --git a/patches/server/0666-Add-critical-damage-API.patch b/patches/server/0665-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0666-Add-critical-damage-API.patch rename to patches/server/0665-Add-critical-damage-API.patch diff --git a/patches/server/0667-Fix-issues-with-mob-conversion.patch b/patches/server/0666-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0667-Fix-issues-with-mob-conversion.patch rename to patches/server/0666-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0668-Add-isCollidable-methods-to-various-places.patch b/patches/server/0667-Add-isCollidable-methods-to-various-places.patch similarity index 93% rename from patches/server/0668-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0667-Add-isCollidable-methods-to-various-places.patch index 587957d8af..8c0d3f840e 100644 --- a/patches/server/0668-Add-isCollidable-methods-to-various-places.patch +++ b/patches/server/0667-Add-isCollidable-methods-to-various-places.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add isCollidable methods to various places public net.minecraft.world.level.block.state.BlockBehaviour hasCollision diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 4c4e242305edf7b8bfa6761cd7e8c9498982608c..5fa6a77ccd01deb929d86efc227439f4f280ba53 100644 +index 29be71311755de77ce854f874b1fe2b093b997cf..6027b675ca032d7c8f6d43624dcfca69d26849ff 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -456,6 +456,11 @@ public class CraftBlock implements Block { @@ -23,7 +23,7 @@ index 4c4e242305edf7b8bfa6761cd7e8c9498982608c..5fa6a77ccd01deb929d86efc227439f4 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java -index eb895090384b6ce0943e8286a3aae55506f4310a..1308720c6f3072a5442b93d495e03735419d59eb 100644 +index aca63719790429d3d7c7c59a1931a98221c70fc0..31bb92c026a4a2de0e8d3500f6ecf35b60d61fb9 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java @@ -331,4 +331,11 @@ public class CraftBlockState implements BlockState { diff --git a/patches/server/0669-Goat-ram-API.patch b/patches/server/0668-Goat-ram-API.patch similarity index 100% rename from patches/server/0669-Goat-ram-API.patch rename to patches/server/0668-Goat-ram-API.patch diff --git a/patches/server/0670-Add-API-for-resetting-a-single-score.patch b/patches/server/0669-Add-API-for-resetting-a-single-score.patch similarity index 91% rename from patches/server/0670-Add-API-for-resetting-a-single-score.patch rename to patches/server/0669-Add-API-for-resetting-a-single-score.patch index 0983cd3cdf..7d45195961 100644 --- a/patches/server/0670-Add-API-for-resetting-a-single-score.patch +++ b/patches/server/0669-Add-API-for-resetting-a-single-score.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add API for resetting a single score It was only possible to reset all scores for a specific entry, instead of resetting only specific scores. diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java -index 024c138082d68291db161a9ca3d233ef27788097..e5898f391e18fe5da9affd9321d1f34bba0af2d0 100644 +index 510f5ce6c4ea16b5ef5b6942311aa6f43b0083be..552a548d5fc72707a3ab56595c1586c0cf70e836 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java @@ -68,4 +68,12 @@ final class CraftScore implements Score { diff --git a/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch similarity index 96% rename from patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch index 9f8f4e9c4f..23ec0bc909 100644 --- a/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 406b2cf18466439f7984497cf5da2bef466de459..7e461dae8e9a290fc54cb933ca8a880ae821ffa9 100644 +index 0dcc94b713593a298f09d489780f38298d5f4cc5..b248207e0dc52f8ac44a93a141e7e883b253a5ed 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2146,6 +2146,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -27,7 +27,7 @@ index 406b2cf18466439f7984497cf5da2bef466de459..7e461dae8e9a290fc54cb933ca8a880a return this.isPassenger() ? false : this.saveAsPassenger(nbt); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 2ea8b72ef450b60ec6d7ec10f3f94d2154e06670..3d9ee3a7305b0575387e719ac4062c4a355d63e8 100644 +index 0a29960fca388dd95710bdba19f37fde6be52073..b38e974ee4aa1577860e1b97cc4b05af3c9b1a39 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1387,5 +1387,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0672-Vanilla-command-permission-fixes.patch b/patches/server/0671-Vanilla-command-permission-fixes.patch similarity index 97% rename from patches/server/0672-Vanilla-command-permission-fixes.patch rename to patches/server/0671-Vanilla-command-permission-fixes.patch index 6a9ac954d9..316475ab5c 100644 --- a/patches/server/0672-Vanilla-command-permission-fixes.patch +++ b/patches/server/0671-Vanilla-command-permission-fixes.patch @@ -51,7 +51,7 @@ index 5fd7e5aa0644fda8e2f7f57eef9a6f0011534cb9..b201fd131864751bea1e926c6b23f974 } diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -index 6b991cd34644077d60269eeba6ce90dbfdf8fbb2..d6a4507f547893bf7f8318723b5f86cc779e47a2 100644 +index 35746f4fc45568c32497677b63a2a746c7a9ba94..13804bb81a13d51d2e9e55d8a477369ba20fc301 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java @@ -88,7 +88,23 @@ public final class VanillaCommandWrapper extends BukkitCommand { diff --git a/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 92% rename from patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index ee020e825e..0949a12465 100644 --- a/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/ state desync POV because the TE is getting unloaded anyways. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a11bd2d9f5b2fb248cc322ea61886050fa2e73a9..80f2a1204bee79daf0cae9310ce8d552c59e66fe 100644 +index 9fd3eca485fc71e5da142f8b6763e44691e3f41c..48513493d92ea0fe5e2cb4f021c843b10caab062 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1555,9 +1555,13 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -28,7 +28,7 @@ index a11bd2d9f5b2fb248cc322ea61886050fa2e73a9..80f2a1204bee79daf0cae9310ce8d552 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6b92189b6dddee7e632c142430eaa784d22adbca..c6d56a225cdaffc0b08eb4805e6bdcb0223fbd91 100644 +index c358a078bdbb672b41f606cf83353fc35bcb4b15..0ee7c54e4e46bc35e5a7b01ddd408bdbe0e3d1c1 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1617,6 +1617,18 @@ public class ServerPlayer extends Player { @@ -51,7 +51,7 @@ index 6b92189b6dddee7e632c142430eaa784d22adbca..c6d56a225cdaffc0b08eb4805e6bdcb0 @Override public void doCloseContainer() { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 39f011a3c5e0eaa24ab95738329ba98aa07a5f36..b40961ad53437a5aa603f658ed56fca827de5716 100644 +index 8dd7a1405997a7e90aab01ca7c20a616b15ca761..85799b95bab12b5a060246f20364e9440e56a3ed 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -508,6 +508,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0674-Fix-GameProfileCache-concurrency.patch b/patches/server/0673-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0674-Fix-GameProfileCache-concurrency.patch rename to patches/server/0673-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0675-Improve-and-expand-AsyncCatcher.patch b/patches/server/0674-Improve-and-expand-AsyncCatcher.patch similarity index 97% rename from patches/server/0675-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0674-Improve-and-expand-AsyncCatcher.patch index d7b23540a8..810a3aa123 100644 --- a/patches/server/0675-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0674-Improve-and-expand-AsyncCatcher.patch @@ -17,7 +17,7 @@ Async catch modifications to critical entity state Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2f3fddf5427248c3283173afaed220f7a3fd9e31..979515ce93ec0cb6589158ac0b1c54f9283f96b6 100644 +index 43e9f9ce338bd1cf803ad707d318cd2435231426..079c7ffa2b1ff8bbb5e51553ad94713d0339e9f4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1543,6 +1543,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -29,7 +29,7 @@ index 2f3fddf5427248c3283173afaed220f7a3fd9e31..979515ce93ec0cb6589158ac0b1c54f9 if (player.isRemoved()) { LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName()); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 14d5d124c34a2092f7a0fc9e1e1305ac9b17ce81..a92345f1f7c4a4153fa55e2b23f4097faf90161d 100644 +index eca3c85b2b24a59b6c3b316e2535f2a4354f50f9..bbeb81980b847a65f8d57eb6caf26aae63ee2061 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1119,7 +1119,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -166,7 +166,7 @@ index 47bab513feec217d875192afef61f3af95b93d24..d3fb277878adb26c7d80cf21f2707038 PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason}); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 2ccfd2834db3571cbfed8b12e45a25dfa159e083..ea820fbbbe3f2df060253dd21813a978460cd705 100644 +index 886f9b0a4cb4bd6d7341a1ea707565c4492f31d4..03b1b9d8bf7b12343564ff6eb4fb865e4626b1e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -464,6 +464,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0677-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0677-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0676-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0678-Optimise-general-POI-access.patch b/patches/server/0677-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0678-Optimise-general-POI-access.patch rename to patches/server/0677-Optimise-general-POI-access.patch diff --git a/patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0680-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0680-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0679-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 94% rename from patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch index ad81d50205..007351ae6c 100644 --- a/patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch +++ b/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch @@ -13,7 +13,7 @@ Paper recently reverted this optimisation, so it's been reintroduced here. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 7113fdf06bc526af62d08313f8c47e14a2f4b652..0f16a962082cf8a213cb348b87683692f818c80a 100644 +index eea2b7f9c566b5a21fa7da7d1321469a12c45b5a..6bd9b680fa1e84d058ada2354fa6a5b876185dc4 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -455,6 +455,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0685-Time-scoreboard-search.patch b/patches/server/0684-Time-scoreboard-search.patch similarity index 96% rename from patches/server/0685-Time-scoreboard-search.patch rename to patches/server/0684-Time-scoreboard-search.patch index e6b092ac61..e2bd684e63 100644 --- a/patches/server/0685-Time-scoreboard-search.patch +++ b/patches/server/0684-Time-scoreboard-search.patch @@ -20,7 +20,7 @@ index 4d861f9a58f8ea238471af22f387854d855b1801..678a31fb85947ee8807d02d0fe4e11a7 private static final Map, String> taskNameCache = new MapMaker().weakKeys().makeMap(); diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java -index 8f20fa2bfbe037fbaa9f4c4c3341a3d9b9a711b5..628951be16da8f19f0e1a974a0b4efa86e873b99 100644 +index f06f011375b9be307a858ccb6579f74942b1d325..24c5e6e3dd41e72d22819964bc8e77f0ebc2d089 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -113,9 +113,18 @@ public final class CraftScoreboardManager implements ScoreboardManager { diff --git a/patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0688-Execute-chunk-tasks-mid-tick.patch b/patches/server/0687-Execute-chunk-tasks-mid-tick.patch similarity index 95% rename from patches/server/0688-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0687-Execute-chunk-tasks-mid-tick.patch index f4272a0512..3a0637b6e5 100644 --- a/patches/server/0688-Execute-chunk-tasks-mid-tick.patch +++ b/patches/server/0687-Execute-chunk-tasks-mid-tick.patch @@ -19,7 +19,7 @@ index 678a31fb85947ee8807d02d0fe4e11a73d2dafaa..0fc4feb00940079c4eb9554a3a48d19c private MinecraftTimings() {} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7e4f3b7a5790292b3b8439fb4696d9d6cfec0167..6c02d5233c782b0e5049afdf84250687ae71dcde 100644 +index d74313b58b660f3c03b8a6db4f80b6b073b6b795..f7c1d07c95f7b67e32bd6679af88612aec74f54f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1285,6 +1285,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 8f7c7094af..63f447f944 100644 --- a/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 979515ce93ec0cb6589158ac0b1c54f9283f96b6..3f88ea6ce570c1b86651e5095970c28cbf3c2a3d 100644 +index 079c7ffa2b1ff8bbb5e51553ad94713d0339e9f4..f1c0ff296b58aa020b00d6681ecf3cb4db09f561 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -734,6 +734,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0701-Add-packet-limiter-config.patch b/patches/server/0700-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0701-Add-packet-limiter-config.patch rename to patches/server/0700-Add-packet-limiter-config.patch diff --git a/patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 97% rename from patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch index 1914569c27..341421e59d 100644 --- a/patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch +++ b/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch @@ -11,7 +11,7 @@ This commit hence simply fixes this by using the proper body colour value when updating the pattern color. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java -index 581e0f4d68d6eb8eb04449586ffdba35e8b3ad2b..9a045a7793ec20334853a0e1c3529b31899214b3 100644 +index a4256ee1c1cd305d1253e7b8084d814428386369..67c56a4f643e1cb52139c8f3ffc4af0cf278339f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java @@ -107,7 +107,7 @@ class CraftMetaTropicalFishBucket extends CraftMetaItem implements TropicalFishB diff --git a/patches/server/0703-Ensure-valid-vehicle-status.patch b/patches/server/0702-Ensure-valid-vehicle-status.patch similarity index 90% rename from patches/server/0703-Ensure-valid-vehicle-status.patch rename to patches/server/0702-Ensure-valid-vehicle-status.patch index 45c65ee8af..608f09c5af 100644 --- a/patches/server/0703-Ensure-valid-vehicle-status.patch +++ b/patches/server/0702-Ensure-valid-vehicle-status.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c6d56a225cdaffc0b08eb4805e6bdcb0223fbd91..c9eb785457b606d8f7c4fe3f824fd6d0a1d1070e 100644 +index 0ee7c54e4e46bc35e5a7b01ddd408bdbe0e3d1c1..e45fc21532911aedacd99315386857e8e54ade32 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -569,7 +569,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0706-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch similarity index 88% rename from patches/server/0706-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0705-Don-t-log-debug-logging-being-disabled.patch index 82e266f96e..2130840734 100644 --- a/patches/server/0706-Don-t-log-debug-logging-being-disabled.patch +++ b/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't log debug logging being disabled diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 3ac48dafe2300ff4cf4591569fec9ce4916503cd..612c3169c3463d702b85975e1db79ae6e47d60d0 100644 +index 1eafb92fdf3c6ddce5f5f847bd9034287e2d4b84..68602dfb171d47e47fd0710b4324013ef05214d0 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -382,7 +382,7 @@ public class SpigotConfig diff --git a/patches/server/0707-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0707-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0706-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0708-Preserve-overstacked-loot.patch b/patches/server/0707-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0708-Preserve-overstacked-loot.patch rename to patches/server/0707-Preserve-overstacked-loot.patch diff --git a/patches/server/0709-Update-head-rotation-in-missing-places.patch b/patches/server/0708-Update-head-rotation-in-missing-places.patch similarity index 93% rename from patches/server/0709-Update-head-rotation-in-missing-places.patch rename to patches/server/0708-Update-head-rotation-in-missing-places.patch index 3abb11c491..77c31f1712 100644 --- a/patches/server/0709-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0708-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 9fc1ef3d4d59ea2236f668495392520f19ef2145..6b07bab1986e66d3e34c6ed3c54035bc8f0473da 100644 +index 808bbccad26c6e0cd07e27d6f380ba1eafd8bd22..69398b0cab962f506416802c20b7e7b76d09939b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1911,6 +1911,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0710-prevent-unintended-light-block-manipulation.patch b/patches/server/0709-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0710-prevent-unintended-light-block-manipulation.patch rename to patches/server/0709-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0711-Fix-CraftCriteria-defaults-map.patch b/patches/server/0710-Fix-CraftCriteria-defaults-map.patch similarity index 91% rename from patches/server/0711-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0710-Fix-CraftCriteria-defaults-map.patch index 65eeffccea..3e79bd7fb7 100644 --- a/patches/server/0711-Fix-CraftCriteria-defaults-map.patch +++ b/patches/server/0710-Fix-CraftCriteria-defaults-map.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix CraftCriteria defaults map diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java -index a8728102499ec8a0b4946bcc9b59c16193731f8c..d849ef9a51dc901c8045d63218b8ee5fa5c7ee7a 100644 +index 441e2122f837712a21328eb7659cc9925ff9b6f8..8464531a4ee400834d25c23b1eb723f49be8689e 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java @@ -54,7 +54,7 @@ public final class CraftCriteria implements Criteria { diff --git a/patches/server/0712-Fix-upstreams-block-state-factories.patch b/patches/server/0711-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0712-Fix-upstreams-block-state-factories.patch rename to patches/server/0711-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0713-Configurable-feature-seeds.patch b/patches/server/0712-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0713-Configurable-feature-seeds.patch rename to patches/server/0712-Configurable-feature-seeds.patch diff --git a/patches/server/0714-Add-root-admin-user-detection.patch b/patches/server/0713-Add-root-admin-user-detection.patch similarity index 97% rename from patches/server/0714-Add-root-admin-user-detection.patch rename to patches/server/0713-Add-root-admin-user-detection.patch index 00bf912738..8f7dec5ba1 100644 --- a/patches/server/0714-Add-root-admin-user-detection.patch +++ b/patches/server/0713-Add-root-admin-user-detection.patch @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6 + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index b9a4447e790f34fd8f88f353bf0e24a18a298ee6..c7894892afe97eb3cb453c37a2d9a23d811d70b8 100644 +index 51c924f051c25cac8172b0ddab83f3b7a69adfe6..5a0a34ea500607b1370df3e5ee4c1ad64f252449 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0715-Always-allow-item-changing-in-Fireball.patch b/patches/server/0714-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0715-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0714-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch similarity index 91% rename from patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch index 3c62c6e020..9cc1f40ca7 100644 --- a/patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0715-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 6b07bab1986e66d3e34c6ed3c54035bc8f0473da..0433887a9f6ad19fdd1f8780424a10b0ef3b4c0e 100644 +index 69398b0cab962f506416802c20b7e7b76d09939b..0fb3cb6a30810b386b6406481f0bd36eb834004c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -787,7 +787,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 94% rename from patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch index 9573ff5d6b..3f080e05bc 100644 --- a/patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d9f9eb379c6d00aa7be40d4889d8ee4fbffab357..ac66d2ee0608b079ac0f1809d9116242daf557c1 100644 +index bbeb81980b847a65f8d57eb6caf26aae63ee2061..1e0dfa8e04e02e552d9233c12be915778bb6e09c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2680,13 +2680,26 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 97% rename from patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch index 9658237f9b..2d07a04363 100644 --- a/patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -34,7 +34,7 @@ index e0802f1cb73a80b08482832c2b269ac8485d5c1a..8d2870c780c4c253f6570c7ef73f6e7c } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ac66d2ee0608b079ac0f1809d9116242daf557c1..f6b8518df044cd57eeafa84890920bba5c36c012 100644 +index 1e0dfa8e04e02e552d9233c12be915778bb6e09c..c2d06bd94c829e1e9cf00c20e5e2547c60d4b0ff 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3191,7 +3191,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0722-Fix-Spigot-growth-modifiers.patch b/patches/server/0721-Fix-Spigot-growth-modifiers.patch similarity index 98% rename from patches/server/0722-Fix-Spigot-growth-modifiers.patch rename to patches/server/0721-Fix-Spigot-growth-modifiers.patch index c83c76a287..2535a2a265 100644 --- a/patches/server/0722-Fix-Spigot-growth-modifiers.patch +++ b/patches/server/0721-Fix-Spigot-growth-modifiers.patch @@ -101,7 +101,7 @@ index 20fdd6cc35bec8f707a83fb682257f68163ed6fc..aca205d641b4a87d093b140585cf04fa this.grow(world, state, pos, 1); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index b7d6197cb5f46bb020fff049ae2dd8fc3ee8ff2f..38da4cc3fe3be86e43432de942a1290fa8215474 100644 +index 11ac344ef113732fa717b67c51f76692b9b247e7..62c1434018be5b5fb70f7019b3c06d4d9200661d 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -96,6 +96,7 @@ public class SpigotWorldConfig diff --git a/patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0724-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0724-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0723-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0725-Optimize-HashMapPalette.patch b/patches/server/0724-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0725-Optimize-HashMapPalette.patch rename to patches/server/0724-Optimize-HashMapPalette.patch diff --git a/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 98% rename from patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch index 96dde1b0d3..4feabbc623 100644 --- a/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 38738fa0b19c665d5458286431db46dbe30dbb41..f436c42325a0dd90bd62f7358a3a9132ce02c192 100644 +index 146b5bd0a081afa8aee0e268bfaf8eb4390eacee..2aacf05d0f79a5418f31a5411b0d06e034f8a0da 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2364,6 +2364,88 @@ public final class CraftServer implements Server { diff --git a/patches/server/0727-Collision-optimisations.patch b/patches/server/0726-Collision-optimisations.patch similarity index 100% rename from patches/server/0727-Collision-optimisations.patch rename to patches/server/0726-Collision-optimisations.patch diff --git a/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch index 8a8c38fd6a..9e795d10e4 100644 --- a/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN CHECK ME diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7bdb23b00cf04e54ba906d6ed10ef96cfb1a2b33..d8f9b5d56ffa79145e1b8a2c809da4d5caad2a23 100644 +index 88c543881c8e7453fffc08e1d5a3226505a8889e..1a44358117e5f72789dd270ce4311f6c6a17bf6d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -534,7 +534,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0730-Add-more-Campfire-API.patch b/patches/server/0729-Add-more-Campfire-API.patch similarity index 98% rename from patches/server/0730-Add-more-Campfire-API.patch rename to patches/server/0729-Add-more-Campfire-API.patch index 5ba5d97bdf..61de925634 100644 --- a/patches/server/0730-Add-more-Campfire-API.patch +++ b/patches/server/0729-Add-more-Campfire-API.patch @@ -66,7 +66,7 @@ index 04b2697ee857e714b1202d02d093b0c60f079a6f..d80855b22dc10dbf697578d5f78664ed @Override diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java -index 28e33d2921c779ee9e96865b0b6c6309a6c27a21..df8c2110d84341e822b7ad981f6c4fe2e1c71601 100644 +index 07556d0961569c1be62a697414bd4ec512b04ac0..cc641dc70dc12b902bd9cad93fffded9032f1e82 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCampfire.java @@ -56,4 +56,40 @@ public class CraftCampfire extends CraftBlockEntityState im diff --git a/patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0732-Fix-tripwire-state-inconsistency.patch b/patches/server/0731-Fix-tripwire-state-inconsistency.patch similarity index 97% rename from patches/server/0732-Fix-tripwire-state-inconsistency.patch rename to patches/server/0731-Fix-tripwire-state-inconsistency.patch index eba71d4136..8c45070e31 100644 --- a/patches/server/0732-Fix-tripwire-state-inconsistency.patch +++ b/patches/server/0731-Fix-tripwire-state-inconsistency.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix tripwire state inconsistency This patch prevents updating and re-setting the tripwire when being removed in certain conditions diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java -index 4e2fb4ee8e46b3c363992ff23e26f5a648c5f003..7f60175bf671d282c11e9084670d2bb900968255 100644 +index 336ffc27ea75fd8fd037c20b931233dc611084f3..a4ceb86f2c1bbd7d76d07532ed8a512722b01381 100644 --- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java @@ -74,7 +74,7 @@ public class TripWireBlock extends Block { diff --git a/patches/server/0733-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch similarity index 95% rename from patches/server/0733-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0732-Forward-CraftEntity-in-teleport-command.patch index 7738d9621a..cdfb7af3ef 100644 --- a/patches/server/0733-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0732-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 ede58a9d1f3245a0d8fd22f40731840877f4cabe..7bbe11ed8f42af737063a803769e29a59e127d1e 100644 +index cc5c122fe9e3528e3b120d00e0a3600ef947c664..27b07629aa36029e251ebbc3fb68466f02c0aab3 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3527,6 +3527,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0734-Improve-scoreboard-entries.patch b/patches/server/0733-Improve-scoreboard-entries.patch similarity index 95% rename from patches/server/0734-Improve-scoreboard-entries.patch rename to patches/server/0733-Improve-scoreboard-entries.patch index 125efaf657..5c71b1a0dc 100644 --- a/patches/server/0734-Improve-scoreboard-entries.patch +++ b/patches/server/0733-Improve-scoreboard-entries.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve scoreboard entries diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java -index be3e1c4765ba891462e36ce5b6e35f16e3ec189a..d00e9ca05c36c2d1194024914bf935db0113d7fa 100644 +index 5a9adade82970d8101b946596370d104721ac086..58cd0a5fccb93b467ca5c31e9c9d5149cb85e30b 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java @@ -145,6 +145,14 @@ final class CraftObjective extends CraftScoreboardComponent implements Objective @@ -52,7 +52,7 @@ index 052389310826ee6b97cf27dfd952e0101fb2d097..a8c5bfc54ed2b8bd873f124c7080d73f + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java -index baff11728120fda1740d5e15163760f50fe1cd1d..4d65d1a0dd52aaeeeef8acf2b0023f27257f60a2 100644 +index c0362c54d0d097ad6cd4616b3ab194e51258da1e..f0b59dd4b7c3d857f7aa7c8263c760f7a46c6e34 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java @@ -304,6 +304,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { diff --git a/patches/server/0735-Entity-powdered-snow-API.patch b/patches/server/0734-Entity-powdered-snow-API.patch similarity index 89% rename from patches/server/0735-Entity-powdered-snow-API.patch rename to patches/server/0734-Entity-powdered-snow-API.patch index 8ea727a6aa..695d4ee581 100644 --- a/patches/server/0735-Entity-powdered-snow-API.patch +++ b/patches/server/0734-Entity-powdered-snow-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Entity powdered snow API public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 3d9ee3a7305b0575387e719ac4062c4a355d63e8..853561c0b3507808c70f4274812407d1ffb37504 100644 +index b38e974ee4aa1577860e1b97cc4b05af3c9b1a39..cd2b8fa364ce49054007468ee607bd9a8c741971 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1397,5 +1397,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -22,7 +22,7 @@ index 3d9ee3a7305b0575387e719ac4062c4a355d63e8..853561c0b3507808c70f4274812407d1 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java -index 956ddd955e6f9b2f02ef05b0e95150c9c90c3107..16e6325a944c1eb21dd5a3835aa8a00d238e7b5d 100644 +index a0ea54181de6c6685deef265cbe9f66aabbca42b..6f98da9be6aef35e3b5c940188b872459a383c8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java @@ -45,4 +45,11 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton { diff --git a/patches/server/0736-Add-API-for-item-entity-health.patch b/patches/server/0735-Add-API-for-item-entity-health.patch similarity index 92% rename from patches/server/0736-Add-API-for-item-entity-health.patch rename to patches/server/0735-Add-API-for-item-entity-health.patch index 2cd4aeff4a..dd1d43a643 100644 --- a/patches/server/0736-Add-API-for-item-entity-health.patch +++ b/patches/server/0735-Add-API-for-item-entity-health.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add API for item entity health public net.minecraft.world.entity.item.ItemEntity health diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index 43f6422fedae4304801c7be21990725eca11fc62..0a075ad3bbe13abc20c1f344cb706278b27bb202 100644 +index 953d3762292a4c15b063f9e237edf2f5c5362cb7..073643d7f83b974509cf2dd4ea41e3dd9cb90a0d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -98,6 +98,21 @@ public class CraftItem extends CraftEntity implements Item { diff --git a/patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 98% rename from patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch index 8c2c2fb117..913048fffc 100644 --- a/patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch +++ b/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch @@ -27,7 +27,7 @@ Co-authored-by: Zach Brown Co-authored-by: Madeline Miller diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java -index 195a08045d6705a47efa918fa0d3882ee9073ab4..5acf0e1fba2967e67bdb208ef73ae8fa84ffe35d 100644 +index b9896fd8e96a908637ce1edf9413166192903ce7..cdcf11fb9e4690d74b30fe0ade842d6574464624 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java @@ -146,15 +146,15 @@ public class PistonBaseBlock extends DirectionalBlock { diff --git a/patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0742-Fix-bees-aging-inside-hives.patch b/patches/server/0741-Fix-bees-aging-inside-hives.patch similarity index 96% rename from patches/server/0742-Fix-bees-aging-inside-hives.patch rename to patches/server/0741-Fix-bees-aging-inside-hives.patch index 2be01a557c..646f563356 100644 --- a/patches/server/0742-Fix-bees-aging-inside-hives.patch +++ b/patches/server/0741-Fix-bees-aging-inside-hives.patch @@ -7,7 +7,7 @@ Fixes bees incorrectly being aged up due to upstream's resetting the ticks inside hive on a failed release diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -index 82ad97800cb115cc4830337a59cc4608c1d4a7a0..41c9f074203915c31c1ae7a160ce509c13383f84 100644 +index 9d4152f9fde93a832f263c793955d327f1e078f7..cf09525efd2d53bf884cd6ec3b0b9229715895eb 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java @@ -328,7 +328,7 @@ public class BeehiveBlockEntity extends BlockEntity { diff --git a/patches/server/0743-Bucketable-API.patch b/patches/server/0742-Bucketable-API.patch similarity index 96% rename from patches/server/0743-Bucketable-API.patch rename to patches/server/0742-Bucketable-API.patch index 4345ec75a6..274ccde059 100644 --- a/patches/server/0743-Bucketable-API.patch +++ b/patches/server/0742-Bucketable-API.patch @@ -55,7 +55,7 @@ index e730292edca4624400bdb89d555922c5f61db7a5..cbfca242f820d238b112f8ce64e9de83 public CraftAxolotl(CraftServer server, net.minecraft.world.entity.animal.axolotl.Axolotl entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java -index 69d103a8ec74b17ee3116bb4d448494bd66f50b6..3c64461119391ec2e987fc936104e21ef0a95ce4 100644 +index da5150f4ca0397bf10053aab0c3ff18af5bc3f3c..eb10f94d5ed8ca89d3786138647dd43357609a6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java @@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.AbstractFish; diff --git a/patches/server/0744-Validate-usernames.patch b/patches/server/0743-Validate-usernames.patch similarity index 95% rename from patches/server/0744-Validate-usernames.patch rename to patches/server/0743-Validate-usernames.patch index 89ea54ab5e..fe0bca6d14 100644 --- a/patches/server/0744-Validate-usernames.patch +++ b/patches/server/0743-Validate-usernames.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 58321faf05c9fbeaf4b417e2749b190ad2a33f60..52f1fcbe104e75e4413e90e77bfc0a93294dd1c6 100644 +index 2e73c94f74be95a7d6ba58d5151c3090253bb9c6..3a177569b9aa8d641252d0169bea8be739344318 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -61,6 +61,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, @@ -56,7 +56,7 @@ index 58321faf05c9fbeaf4b417e2749b190ad2a33f60..52f1fcbe104e75e4413e90e77bfc0a93 GameProfile gameprofile = this.server.getSingleplayerProfile(); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c493f883940819913f0cecb5e374fe94123df24c..d5d83e605a33d2edd1c7c0ef7cfa8af35e22dcc9 100644 +index f505977aaa48ab25b0a8a630f51e36551cb0fa79..b380cbe84835bbe68f63f097dfb57d960bbe3271 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -660,7 +660,7 @@ public abstract class PlayerList { diff --git a/patches/server/0745-Make-water-animal-spawn-height-configurable.patch b/patches/server/0744-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0745-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0744-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 96% rename from patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 83b64455e5..4ed71d8ecc 100644 --- a/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6c02d5233c782b0e5049afdf84250687ae71dcde..2503e2b2436a6e07fa22c0e55ad1539bae06de1a 100644 +index f7c1d07c95f7b67e32bd6679af88612aec74f54f..9d4c9368fcc3a44e452c1b71b5bdb43d097132d2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -550,7 +550,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d500962858fc9598481ff019bda1d1a7ad1813b7..6185477e9fc0ab2ed4e8e5835cc6e8e1adc79ef9 100644 +index a0ec7bc7d89a165ad63c524433724caaec7c3c7c..b60765a2176d7a290d2c9b09ba101d61ac572b21 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -142,6 +142,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 92% rename from patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 94c24dc109..56af4853a3 100644 --- a/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6254c962346c243a596ba3ace41a2d5218c86776..28c4be4c1876daa1919ac0c2e506747460918631 100644 +index 0bca5e89bc8df486b44c0921e217d0546a490d4e..93b101b8435fed77950e508901f380e20f943b74 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2192,6 +2192,8 @@ public final class CraftServer implements Server { diff --git a/patches/server/0766-Add-GameEvent-tags.patch b/patches/server/0765-Add-GameEvent-tags.patch similarity index 97% rename from patches/server/0766-Add-GameEvent-tags.patch rename to patches/server/0765-Add-GameEvent-tags.patch index 7728d3b25d..02e72d2282 100644 --- a/patches/server/0766-Add-GameEvent-tags.patch +++ b/patches/server/0765-Add-GameEvent-tags.patch @@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 28c4be4c1876daa1919ac0c2e506747460918631..b29ae6ae2a869cba148f5e3be76962182934a577 100644 +index 93b101b8435fed77950e508901f380e20f943b74..2fd1d5c15a5231b0f889832ff1c57156ef46816d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2613,6 +2613,15 @@ public final class CraftServer implements Server { diff --git a/patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 94% rename from patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch index df4db48d20..1c13cca49e 100644 --- a/patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch +++ b/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch @@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether, for example. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2503e2b2436a6e07fa22c0e55ad1539bae06de1a..5e90384ae64af46acff9d1b58c7d401e5590859c 100644 +index 9d4c9368fcc3a44e452c1b71b5bdb43d097132d2..c4f90c6fc7bdf7339720936ad2c781396e7d91c4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1288,6 +1288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop extends CraftBlo diff --git a/patches/server/0770-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0770-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0769-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 96% rename from patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch index e30c102eaa..9a36732d25 100644 --- a/patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch +++ b/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch @@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which is one level below that. Defaults to off to keep vanilla behavior. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5e90384ae64af46acff9d1b58c7d401e5590859c..7d944606f7e136aa60a0ea376ef325887bd4e6a8 100644 +index c4f90c6fc7bdf7339720936ad2c781396e7d91c4..ebf31af53f26d33a745badbfc6fa4e7f84aea87d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -577,7 +577,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 94% rename from patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch index 7d232d5b1a..1305d58c28 100644 --- a/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch +++ b/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors TODO: potentially add some kick leeway diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 616ea3055c854872fbb5754bdf0b67deac1b4b58..e6efb852e2454294073968de546b5c61b6131766 100644 +index 3017a4509cf112578b96dce9bd517256313ebcb8..96882c99ad0f3dfb58d4e7a38a17929e252033c1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2148,7 +2148,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0831-Fix-Bee-flower-NPE.patch b/patches/server/0830-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0831-Fix-Bee-flower-NPE.patch rename to patches/server/0830-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 92% rename from patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index 2eb8c8b516..eb5f74ca9a 100644 --- a/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e6efb852e2454294073968de546b5c61b6131766..3663332ddc408b1f918b9f7b0a461a346073c9a4 100644 +index 96882c99ad0f3dfb58d4e7a38a17929e252033c1..7e388fc82cb4f7a71b36a204c5af827509ab60f3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2368,7 +2368,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0833-More-Teleport-API.patch b/patches/server/0832-More-Teleport-API.patch similarity index 100% rename from patches/server/0833-More-Teleport-API.patch rename to patches/server/0832-More-Teleport-API.patch diff --git a/patches/server/0834-Add-EntityPortalReadyEvent.patch b/patches/server/0833-Add-EntityPortalReadyEvent.patch similarity index 95% rename from patches/server/0834-Add-EntityPortalReadyEvent.patch rename to patches/server/0833-Add-EntityPortalReadyEvent.patch index b391863a8a..92b7d3617b 100644 --- a/patches/server/0834-Add-EntityPortalReadyEvent.patch +++ b/patches/server/0833-Add-EntityPortalReadyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ca0106627279c581550c5e86bfc9a1ee5a9d6173..a60bb065cedc9c70a4c9363d6994a9d00a5c15c9 100644 +index aa9fa4afe80fad145d94406f26dda2341da87dbe..bc303e7ab3c8db5cffec2c1c3640fbaf59601101 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3095,6 +3095,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0836-Send-block-entities-after-destroy-prediction.patch b/patches/server/0835-Send-block-entities-after-destroy-prediction.patch similarity index 96% rename from patches/server/0836-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0835-Send-block-entities-after-destroy-prediction.patch index d8a6e3fc1f..1ea3e81505 100644 --- a/patches/server/0836-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0835-Send-block-entities-after-destroy-prediction.patch @@ -7,7 +7,7 @@ Minecraft's prediction system does not handle block entities, so if we are manua block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6f027c151 100644 +index 3fe747fdc4500bd65029446f63e314031d71ed4a..19573bfb05d7f9641964c76e6670e4a7658a1bbd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -62,6 +62,8 @@ public class ServerPlayerGameMode { @@ -57,7 +57,7 @@ index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ca4e4d5f272f2368a966a9eead1ba047c4cbc77a..1c98d65ed237d63faabcef64093957aef3157abf 100644 +index 331d8c69dc4464ff6b44b4b37ecf426ff3514fc3..bfa2e9919275a1eb5d83403c5ed88eee245e3194 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1751,8 +1751,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 96% rename from patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch index af872060f6..22237fb9e2 100644 --- a/patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch +++ b/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index ba5ad3372b3f3f2110841100729ea3b4c06ecc75..07a5bbdcada2d2cdb1c3d245379217fe19a48b75 100644 +index 412f2283a85c39bfb730c73376ec663a79fb9187..a28da797e3ea01eacb378f65da3cfc75cb6b1830 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -810,7 +810,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -18,7 +18,7 @@ index ba5ad3372b3f3f2110841100729ea3b4c06ecc75..07a5bbdcada2d2cdb1c3d245379217fe private static boolean isOutsideSpawnableHeight(int y) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 32116487ea913080bc01a2e74b66d6034813b86e..2235b327afc8f1e4d54fcf3dc9e99c6fcd8cf901 100644 +index 6beefb48468779005cb3e93d1c6d8c0465e84d73..c9ab48d99992a39cc6977424c589489a35f36992 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -310,9 +310,24 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch index a4b0fa47b7..70a7bab286 100644 --- a/patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0fc4a90383a5b332cad58ec55e30dc363aed16ca..55d95fe1bb0fe5064bf5855a4e7aaee8a0b4abd7 100644 +index 8bdfbe71e2718e0e24b1de048c8e48927fae1e3a..7cea988c9ada598f00e79c834c644d6bf01b4c93 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -652,6 +652,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0840-Collision-API.patch b/patches/server/0839-Collision-API.patch similarity index 96% rename from patches/server/0840-Collision-API.patch rename to patches/server/0839-Collision-API.patch index 4c9bd750bb..efa8916419 100644 --- a/patches/server/0840-Collision-API.patch +++ b/patches/server/0839-Collision-API.patch @@ -22,7 +22,7 @@ index 57bb76050919d187adef4bfa8b21416a70867d23..254cdf5efe85583c5ef126d46af7c524 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 6fdde2f766b91833dc2318526f84e96cb26233b4..8733255559e63d8709d2502e58f16decdf1714ae 100644 +index 706eeebe3ebbecd431c42140e7f351d5f7faf032..53bda7a59a3abf6f99a044df5f2c44bedf1af501 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1435,4 +1435,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0842-Block-Ticking-API.patch b/patches/server/0841-Block-Ticking-API.patch similarity index 95% rename from patches/server/0842-Block-Ticking-API.patch rename to patches/server/0841-Block-Ticking-API.patch index ea73ea61f0..4511a8454a 100644 --- a/patches/server/0842-Block-Ticking-API.patch +++ b/patches/server/0841-Block-Ticking-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Block Ticking API diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 8fb44799c3273841ffc0996aa8984513e391c70d..e8dd0b9184e164b41cb4b361f23b6925e7670f8f 100644 +index 8f588ce8de7304dbb48bca01ed331f65ba25fef8..11cc7e640774c6098c247382da8520d62ba19c32 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -708,5 +708,21 @@ public class CraftBlock implements Block { diff --git a/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 92% rename from patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch index 02c71ad921..c067fd1eaf 100644 --- a/patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch +++ b/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use thread safe random in ServerLoginPacketListenerImpl diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 78810048fde7fd6299cdc99634ba646755e0c41c..ff2dd53e9e943aa929188fd9d4c35498b78c497a 100644 +index aac84898d2563bfb45c7d0884d65be2346d2911e..1c4f272219e68373eaae93fc5ea9af7d8f3fd6f9 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -50,6 +50,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0845-Add-NamespacedKey-biome-methods.patch b/patches/server/0844-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0845-Add-NamespacedKey-biome-methods.patch rename to patches/server/0844-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch similarity index 93% rename from patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch index 1255d4ddb9..a3c6981860 100644 --- a/patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch @@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index dd05048c5c9c37002708f0eee4e4fa0f6d86834c..b5ffa564cf6389b6af281ecf12b8daa139861608 100644 +index 47c984495a66fdbb10dea6bab33da78f4ab70a38..ebc35224004375b77039342926876a408995b04d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -980,6 +980,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/patches/server/0872-Add-fire-tick-delay-option.patch b/patches/server/0871-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0872-Add-fire-tick-delay-option.patch rename to patches/server/0871-Add-fire-tick-delay-option.patch diff --git a/patches/server/0873-Add-Moving-Piston-API.patch b/patches/server/0872-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0873-Add-Moving-Piston-API.patch rename to patches/server/0872-Add-Moving-Piston-API.patch diff --git a/patches/server/0874-Ignore-impossible-spawn-tick.patch b/patches/server/0873-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0874-Ignore-impossible-spawn-tick.patch rename to patches/server/0873-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 95% rename from patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch index d7fe125f17..0cdc0de2ff 100644 --- a/patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch +++ b/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a60bb065cedc9c70a4c9363d6994a9d00a5c15c9..bff10831c154087077dd21b0d5b37c68b98e42dc 100644 +index bc303e7ab3c8db5cffec2c1c3640fbaf59601101..c71011cdc4ab02c4e39f8ef39a5030b1c16f3d8f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3374,6 +3374,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0878-Prevent-compass-from-loading-chunks.patch b/patches/server/0877-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0878-Prevent-compass-from-loading-chunks.patch rename to patches/server/0877-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0879-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch similarity index 93% rename from patches/server/0879-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0878-Add-PrePlayerAttackEntityEvent.patch index d2c7b4c788..59e72b4db1 100644 --- a/patches/server/0879-Add-PrePlayerAttackEntityEvent.patch +++ b/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index b40961ad53437a5aa603f658ed56fca827de5716..6bf59f8e7f23ffabd2c6f739fe0daf9da6246e1d 100644 +index 85799b95bab12b5a060246f20364e9440e56a3ed..f9a308490e1cd7745dc12369c6041f0ae9e0b1e1 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1245,8 +1245,17 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0882-Add-Player-Warden-Warning-API.patch b/patches/server/0881-Add-Player-Warden-Warning-API.patch similarity index 95% rename from patches/server/0882-Add-Player-Warden-Warning-API.patch rename to patches/server/0881-Add-Player-Warden-Warning-API.patch index 6b55e882b7..249094a304 100644 --- a/patches/server/0882-Add-Player-Warden-Warning-API.patch +++ b/patches/server/0881-Add-Player-Warden-Warning-API.patch @@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index eb2ef913705a8350493ef215c1ad123082b69c98..8b94aefb8386b7569028fc999c77e64d1b5c9399 100644 +index d24f7d1a3e9d7f0752a8c3c028465cdaf13f8cf8..7569b59b75adf4c7870cc95aad92ccc949a8a070 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3177,6 +3177,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch similarity index 94% rename from patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch index 9c5c52b756..667a65e357 100644 --- a/patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch +++ b/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More vanilla friendly methods to update trades diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 84cee8fb09f90424438de336f60d9388da1b39de..f555e29c7f9ea4ddb243a018bdc93d2bf1950c3c 100644 +index f58be4e2529759cc64df2c70a69ef56eabbb762d..cbe2a37f74f4fb2abd0b3297699e54335aaed64f 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -944,6 +944,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -35,7 +35,7 @@ index 84cee8fb09f90424438de336f60d9388da1b39de..f555e29c7f9ea4ddb243a018bdc93d2b public void gossip(ServerLevel world, Villager villager, long time) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -index 5e779b7f1ba40e418d24c9d37506420c83bfb3fe..a67b5d20b956e0bf801c9eeb9330567c21927010 100644 +index 00fb708bce2c79817cd9fccadec72f07f0d26317..6c15d40979fd3e3d246a447c432b321fbf29ada3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -95,6 +95,34 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { diff --git a/patches/server/0884-Add-paper-dumplisteners-command.patch b/patches/server/0883-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0884-Add-paper-dumplisteners-command.patch rename to patches/server/0883-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0885-check-global-player-list-where-appropriate.patch b/patches/server/0884-check-global-player-list-where-appropriate.patch similarity index 91% rename from patches/server/0885-check-global-player-list-where-appropriate.patch rename to patches/server/0884-check-global-player-list-where-appropriate.patch index 0dcf88b979..1b18c29415 100644 --- a/patches/server/0885-check-global-player-list-where-appropriate.patch +++ b/patches/server/0884-check-global-player-list-where-appropriate.patch @@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player instead of just checking players in their world. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5803f7b286cd262a8f79d0adb159d897361275a2..42f0ea87dd0bb3be3fbe9e0f7d87582cd3cd7c97 100644 +index 2ef076900edc35b6a0beac4e6f7ee4a7f255671c..a1f25978c50b9b924fda0e399ec7eb5a58562c1b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2710,4 +2710,12 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -24,7 +24,7 @@ index 5803f7b286cd262a8f79d0adb159d897361275a2..42f0ea87dd0bb3be3fbe9e0f7d87582c + // Paper end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3ac6e5c091077add9bb21675f4b082cd90e946a2..17cb02b76fd7e5944e0299a78230baf970bc2f25 100644 +index e2ccf8badc02b5a21e3fcd6fcac76155d29e472c..a73fdae75a8ef1b5c0aa7c05bd1ec9081634f565 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3676,7 +3676,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -37,7 +37,7 @@ index 3ac6e5c091077add9bb21675f4b082cd90e946a2..17cb02b76fd7e5944e0299a78230baf9 if (entity instanceof ServerPlayer) { CriteriaTriggers.THROWN_ITEM_PICKED_UP_BY_ENTITY.trigger((ServerPlayer) entity, item.getItem(), this); diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java -index 4b2cd6d34ea4081cad86041f57ccda41807d4279..807cff3fb51269b97d9aecbcc4706f0a139dfeaa 100644 +index d4ac3e566b47cfc8688bcc2ab08385b6de4693f8..94396ad1a3c280787d36c6c18256d10340ace488 100644 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java @@ -272,7 +272,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder { @@ -66,7 +66,7 @@ index 9f892de55ab03367daed4c30cc44c9dd8adc29ed..b3293a722fb5c5262a777402140c764c + // Paper end } diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java -index faad948f089575e4988d989790cc1dd13f8a79cd..5935cf23ec11ae48b6c7cec9bd696d10d808e729 100644 +index ee11a52e82091911aa3a196bcc1f7ab829626cef..bcb9556314ccfcf54ec49860f46b309c72be0714 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java @@ -100,6 +100,13 @@ public class SculkShriekerBlockEntity extends BlockEntity implements GameEventLi diff --git a/patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0887-ItemStack-damage-API.patch b/patches/server/0886-ItemStack-damage-API.patch similarity index 97% rename from patches/server/0887-ItemStack-damage-API.patch rename to patches/server/0886-ItemStack-damage-API.patch index 2de74483ab..83ab1c3ff4 100644 --- a/patches/server/0887-ItemStack-damage-API.patch +++ b/patches/server/0886-ItemStack-damage-API.patch @@ -11,7 +11,7 @@ the logic associated with damaging them public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index bdaa21becdc17823628542d612daf2e055a273c8..725053ca75b0747d69ab3ec8e7035f9b58b82a8c 100644 +index e76dfca102ef9b497fc28c9c221ac33fe3c31c10..87a5260a94dc3388bad2803c64ecf15a8063ba9d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1017,6 +1017,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0888-Friction-API.patch b/patches/server/0887-Friction-API.patch similarity index 96% rename from patches/server/0888-Friction-API.patch rename to patches/server/0887-Friction-API.patch index b18e996baf..7d174e0e49 100644 --- a/patches/server/0888-Friction-API.patch +++ b/patches/server/0887-Friction-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Friction API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4ed23c6143a96e75b0e2e060861dd7c702ce6a95..a9ee6deb5954e8bb9eaf93897f4eacdd481a61c5 100644 +index a73fdae75a8ef1b5c0aa7c05bd1ec9081634f565..e579d9cc70115a3fb3388adb309847faa1f9aaab 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -109,7 +109,7 @@ index 1a06d8c839e94fe2c1920035d606b62e0dc5cfba..eb0351aa12eebcefab1d1d14641fc3c6 this.setItem(ItemStack.of(nbttagcompound1)); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index 0a075ad3bbe13abc20c1f344cb706278b27bb202..9c0f83ff8113696309265fb9e8f6006296de86a6 100644 +index 073643d7f83b974509cf2dd4ea41e3dd9cb90a0d..f444e843535ec68ede0f05e7e7ef182ce872342b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -99,6 +99,18 @@ public class CraftItem extends CraftEntity implements Item { @@ -132,7 +132,7 @@ index 0a075ad3bbe13abc20c1f344cb706278b27bb202..9c0f83ff8113696309265fb9e8f60062 public int getHealth() { return this.getHandle().health; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 725053ca75b0747d69ab3ec8e7035f9b58b82a8c..6ec847b7928cf4217f4588cbb35224fe8db85fd4 100644 +index 87a5260a94dc3388bad2803c64ecf15a8063ba9d..962f4653757f870aff1bea8e98bcafabe639dc86 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1064,6 +1064,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0890-Fix-player-kick-on-shutdown.patch b/patches/server/0889-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0890-Fix-player-kick-on-shutdown.patch rename to patches/server/0889-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0891-Sync-offhand-slot-in-menus.patch b/patches/server/0890-Sync-offhand-slot-in-menus.patch similarity index 97% rename from patches/server/0891-Sync-offhand-slot-in-menus.patch rename to patches/server/0890-Sync-offhand-slot-in-menus.patch index aef2af9e40..d54a5a6e67 100644 --- a/patches/server/0891-Sync-offhand-slot-in-menus.patch +++ b/patches/server/0890-Sync-offhand-slot-in-menus.patch @@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th by pressing the offhand swap item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index bf17062ff3d7eb3085070f5186ab6477e9c1338e..76d513c61eec05edc8b037f2567562fb677f2d95 100644 +index cd0f542a04ba23fc1bc3ac0a5a1910874f9d7c2c..18518aaa8fad4130b7c89e8a36ed5434258d14f6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -341,6 +341,13 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0892-Player-Entity-Tracking-Events.patch b/patches/server/0891-Player-Entity-Tracking-Events.patch similarity index 94% rename from patches/server/0892-Player-Entity-Tracking-Events.patch rename to patches/server/0891-Player-Entity-Tracking-Events.patch index db19a6b1d1..7deeb6f655 100644 --- a/patches/server/0892-Player-Entity-Tracking-Events.patch +++ b/patches/server/0891-Player-Entity-Tracking-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Entity Tracking Events diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d58c25b639df59212c61bab989a11679852eea26..d20112349868f4c76f43882ad0cab7be025a6303 100644 +index 81d3d664d4397e528a02e50469622c4ff3ffb804..c081842b4416d15342cbfc583ef367901dab2b7e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1410,9 +1410,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0893-Limit-pet-look-distance.patch b/patches/server/0892-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0893-Limit-pet-look-distance.patch rename to patches/server/0892-Limit-pet-look-distance.patch diff --git a/patches/server/0894-Properly-resend-entities.patch b/patches/server/0893-Properly-resend-entities.patch similarity index 100% rename from patches/server/0894-Properly-resend-entities.patch rename to patches/server/0893-Properly-resend-entities.patch diff --git a/patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0896-fix-Instruments.patch b/patches/server/0895-fix-Instruments.patch similarity index 96% rename from patches/server/0896-fix-Instruments.patch rename to patches/server/0895-fix-Instruments.patch index 81ec752460..8132408618 100644 --- a/patches/server/0896-fix-Instruments.patch +++ b/patches/server/0895-fix-Instruments.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments properly handle Player#playNote diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4096145769065693c6d67f092ccedccb78ef4578..292054f546669fe607715e2d39e8ed558fc6fc0c 100644 +index 7569b59b75adf4c7870cc95aad92ccc949a8a070..f496824194613851ea3eb500b12fe7b9351fea88 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -726,29 +726,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0899-Add-BlockLockCheckEvent.patch b/patches/server/0898-Add-BlockLockCheckEvent.patch similarity index 98% rename from patches/server/0899-Add-BlockLockCheckEvent.patch rename to patches/server/0898-Add-BlockLockCheckEvent.patch index b57d228198..860cae73de 100644 --- a/patches/server/0899-Add-BlockLockCheckEvent.patch +++ b/patches/server/0898-Add-BlockLockCheckEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockLockCheckEvent diff --git a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java -index f1acd19432877a833f0d4339f9de4830a0f7b890..8d38ebfdc976b9695ed367591e58de8ca18f00f3 100644 +index fce3a45d09a93ca68a3d49f2e666afa4c860d042..c134d089e55ea2ffb180f92aea020bd7647259c9 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java @@ -69,17 +69,44 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co diff --git a/patches/server/0900-Add-Sneaking-API-for-Entities.patch b/patches/server/0899-Add-Sneaking-API-for-Entities.patch similarity index 91% rename from patches/server/0900-Add-Sneaking-API-for-Entities.patch rename to patches/server/0899-Add-Sneaking-API-for-Entities.patch index 05d02cc28f..9106439646 100644 --- a/patches/server/0900-Add-Sneaking-API-for-Entities.patch +++ b/patches/server/0899-Add-Sneaking-API-for-Entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 6759dad436d9e82f9c959e2c183e6e95c37abdcb..d97bc672a8e6fb7c2a0ed668cc15b54bf4254217 100644 +index dc1cc4db2195d4f346bdc5f39e2e14dba454f13d..841a007f24c3d9be2e8b6a9d03ba1694544996fd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1218,6 +1218,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0901-Improve-logging-and-errors.patch b/patches/server/0900-Improve-logging-and-errors.patch similarity index 97% rename from patches/server/0901-Improve-logging-and-errors.patch rename to patches/server/0900-Improve-logging-and-errors.patch index 2c50ac6192..8689ac7c75 100644 --- a/patches/server/0901-Improve-logging-and-errors.patch +++ b/patches/server/0900-Improve-logging-and-errors.patch @@ -19,7 +19,7 @@ index 938fe76677139e7e99698b61691bfcadf70dbd87..8aa7439d9f3c071f88c84c6c75b7a65e if (advancement.parent() == null) { this.roots.remove(advancement); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1ca01bd97068509e050485ffaddd7583563a29b8..56daa503f4471cbe2934ac554db1e0c56ecabff3 100644 +index c4425cd7357049e74e825b824e30b9691ad93196..0cd46c761253c197e94b16a78f15110b35b12c12 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3385,7 +3385,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0902-Improve-PortalEvents.patch b/patches/server/0901-Improve-PortalEvents.patch similarity index 93% rename from patches/server/0902-Improve-PortalEvents.patch rename to patches/server/0901-Improve-PortalEvents.patch index 0bbf4bfcbc..0ac3f798dc 100644 --- a/patches/server/0902-Improve-PortalEvents.patch +++ b/patches/server/0901-Improve-PortalEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bff10831c154087077dd21b0d5b37c68b98e42dc..7ccaf608d6afb96edbd0cdfdd85d8b9b13b3fa6a 100644 +index c71011cdc4ab02c4e39f8ef39a5030b1c16f3d8f..044106ea0907d24ab81c677d568e4433dca6ba1d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3757,7 +3757,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch similarity index 95% rename from patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch index c37cb75cc6..1a5abc1781 100644 --- a/patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch +++ b/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7ccaf608d6afb96edbd0cdfdd85d8b9b13b3fa6a..d93ae4c8d2f6bfc8f2114c523ffad44e7ba735a7 100644 +index 044106ea0907d24ab81c677d568e4433dca6ba1d..a5b646d7167234d04232e244e32a977e89476802 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 90% rename from patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch index 50b24fc2c0..581ad00ec1 100644 --- a/patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch +++ b/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix NPE on Allay#stopDancing while not dancing diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java -index cb8c2d0efa72c00a57dee5949943f6c7a2019c64..dc19a0ad99deed9cc71c243322e375b740db7a9b 100644 +index 1d04df8752af74ae73231922041d09df9d7492bb..c64918175ec08d20cde2bda9e0cac8b474385fe0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java @@ -78,7 +78,7 @@ public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay diff --git a/patches/server/0906-Flying-Fall-Damage.patch b/patches/server/0905-Flying-Fall-Damage.patch similarity index 91% rename from patches/server/0906-Flying-Fall-Damage.patch rename to patches/server/0905-Flying-Fall-Damage.patch index 062be73949..3231fd2429 100644 --- a/patches/server/0906-Flying-Fall-Damage.patch +++ b/patches/server/0905-Flying-Fall-Damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 6bf59f8e7f23ffabd2c6f739fe0daf9da6246e1d..d58b4c0dbe651b5068212e5f14dce3164ee520f5 100644 +index f9a308490e1cd7745dc12369c6041f0ae9e0b1e1..481c3e321cfc0f20bb1c4c6942b8bdbd23c06339 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -186,6 +186,7 @@ public abstract class Player extends LivingEntity { @@ -26,7 +26,7 @@ index 6bf59f8e7f23ffabd2c6f739fe0daf9da6246e1d..d58b4c0dbe651b5068212e5f14dce316 } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 292054f546669fe607715e2d39e8ed558fc6fc0c..b62ccc0aed92b825805e540c67fbf15399e1500d 100644 +index f496824194613851ea3eb500b12fe7b9351fea88..20b1de95c3afbf9cfd4f8943e06fdf07caa21219 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2392,6 +2392,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 99% rename from patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch index b80b116381..39ca938316 100644 --- a/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch +++ b/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch @@ -130,7 +130,7 @@ index e44cd3b8eef25a3e7eedbe8ae597d74585ecd627..e3b07d623cd64de9645f2372f1e08757 // See BlockStateFactory#createBlockState(World, BlockPosition, IBlockData, TileEntity) private static CraftBlockState getBlockState(World world, BlockPos blockPosition, net.minecraft.world.level.block.state.BlockState blockData, BlockEntity tileEntity) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f7f325bd2ff46bb02cc8aa31ea99cca5d0cb1ed8..059bde3786ba16e2a95314664d825492111c3787 100644 +index 10169884ea37531a08d5a0ecb1fae95874332496..73f12036dbbcecbd5848c8eda391fc34d04e9995 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1046,7 +1046,7 @@ public class CraftEventFactory { diff --git a/patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 91% rename from patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch index 40033e7a91..1e77b38126 100644 --- a/patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch +++ b/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d93ae4c8d2f6bfc8f2114c523ffad44e7ba735a7..5dc48c6cced218be3428b420f4823330ea84ba0a 100644 +index a5b646d7167234d04232e244e32a977e89476802..11a4d679c5b46f52eeb51b844f240a835027216a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1156,7 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0909-config-for-disabling-entity-tag-tags.patch b/patches/server/0908-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0909-config-for-disabling-entity-tag-tags.patch rename to patches/server/0908-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0910-Use-single-player-info-update-packet-on-join.patch b/patches/server/0909-Use-single-player-info-update-packet-on-join.patch similarity index 94% rename from patches/server/0910-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0909-Use-single-player-info-update-packet-on-join.patch index a42843df0e..70aff90471 100644 --- a/patches/server/0910-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0909-Use-single-player-info-update-packet-on-join.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 95a643bcd8d43b877e1496068c38ccc7f247924e..bbb42a372d314621221688d8d5d6f418e45f4e08 100644 +index a6630c0aefb31b4b07b62219e27ce724325d291c..f53bb528e9682c554751fefe549fe823958a79dd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3415,7 +3415,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -18,7 +18,7 @@ index 95a643bcd8d43b877e1496068c38ccc7f247924e..bbb42a372d314621221688d8d5d6f418 }); } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index a56995333931685eecf6ea90ff1a89d38b4a2336..fb257dac3abcf899d3db1df47cd7c0ce395c585b 100644 +index 19a01b59ce3e75a0ed48e8fc7678063576d9a2b0..1354be9580ca74485fa0b7ba97fe94079292b8a0 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -339,6 +339,7 @@ public abstract class PlayerList { diff --git a/patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0912-Win-Screen-API.patch b/patches/server/0911-Win-Screen-API.patch similarity index 93% rename from patches/server/0912-Win-Screen-API.patch rename to patches/server/0911-Win-Screen-API.patch index 5eb460ebe5..bd69622d7c 100644 --- a/patches/server/0912-Win-Screen-API.patch +++ b/patches/server/0911-Win-Screen-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API public net.minecraft.server.level.ServerPlayer seenCredits diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b62ccc0aed92b825805e540c67fbf15399e1500d..f7be775567a9aba1933bc3cf5d4e887ab589d778 100644 +index 20b1de95c3afbf9cfd4f8943e06fdf07caa21219..42c6288d26dc866dae19031aa3310d88274a6fbf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1215,6 +1215,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 93% rename from patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch index b85d1dc31d..76965d3ef0 100644 --- a/patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch +++ b/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch @@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create a problem with operations on the vanilla ItemStack. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 28e6933e5b02d1d2f983968692bffa2b9e572051..ce82f313007762b6d1d9f006f21a8858e2976efb 100644 +index 5f8f601f5711f4e7aa3f3a6ca047fd75264d0d04..b758cf51923f9e227c287680287dc18525bed4a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -157,7 +157,7 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/0914-Fix-force-opening-enchantment-tables.patch b/patches/server/0913-Fix-force-opening-enchantment-tables.patch similarity index 94% rename from patches/server/0914-Fix-force-opening-enchantment-tables.patch rename to patches/server/0913-Fix-force-opening-enchantment-tables.patch index 3ebf5a30b4..7bdc01b518 100644 --- a/patches/server/0914-Fix-force-opening-enchantment-tables.patch +++ b/patches/server/0913-Fix-force-opening-enchantment-tables.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix force-opening enchantment tables diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index beefbb0d04bd995bc8750707487183c3ffc22239..196aa9dd610e7a10c35e0a532de012976829bb43 100644 +index 9531094aa2b551e5576b0af494cc141fd8cac007..e6326a7cefee568d7639cd3d0166910f8b965b80 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -402,7 +402,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0915-Add-Entity-Body-Yaw-API.patch b/patches/server/0914-Add-Entity-Body-Yaw-API.patch similarity index 92% rename from patches/server/0915-Add-Entity-Body-Yaw-API.patch rename to patches/server/0914-Add-Entity-Body-Yaw-API.patch index 1eed2eca74..e9df66e906 100644 --- a/patches/server/0915-Add-Entity-Body-Yaw-API.patch +++ b/patches/server/0914-Add-Entity-Body-Yaw-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index d97bc672a8e6fb7c2a0ed668cc15b54bf4254217..314168d162f1242eca67706fd3fa225f1ed30cc4 100644 +index 841a007f24c3d9be2e8b6a9d03ba1694544996fd..9bd6d3be29b2f50bc91fa02382e34213f51337f5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1450,6 +1450,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -41,7 +41,7 @@ index d97bc672a8e6fb7c2a0ed668cc15b54bf4254217..314168d162f1242eca67706fd3fa225f // Paper Start - Collision API @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 6ec847b7928cf4217f4588cbb35224fe8db85fd4..bb5980b7e265860968bc86216f2f3ad47301830c 100644 +index 962f4653757f870aff1bea8e98bcafabe639dc86..6a4639a4584f3497661f8870d5722e300638e52a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1056,6 +1056,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 90% rename from patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch index 599ae035d5..9af995e790 100644 --- a/patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch +++ b/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Update the flag when a captured block state is outdated diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 07a5bbdcada2d2cdb1c3d245379217fe19a48b75..487a25ca0f6719742a88648fbbebfc3e29e105f5 100644 +index a28da797e3ea01eacb378f65da3cfc75cb6b1830..6942c0e42814b995971bbe9bd3bd396e121989dd 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -920,6 +920,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0918-Add-EntityFertilizeEggEvent.patch b/patches/server/0917-Add-EntityFertilizeEggEvent.patch similarity index 98% rename from patches/server/0918-Add-EntityFertilizeEggEvent.patch rename to patches/server/0917-Add-EntityFertilizeEggEvent.patch index 14cc635210..ea181cda54 100644 --- a/patches/server/0918-Add-EntityFertilizeEggEvent.patch +++ b/patches/server/0917-Add-EntityFertilizeEggEvent.patch @@ -69,7 +69,7 @@ index 36b3945832733b5ad66d25aa3a31335234d2acff..47a5125e44cea1ece84657cdb874807f this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F); } // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 059bde3786ba16e2a95314664d825492111c3787..a2af7cdc6e538e844f354b2acb30ae3d6e103533 100644 +index 73f12036dbbcecbd5848c8eda391fc34d04e9995..4ad092c25a17cfb3eae26316260ddeeb66a59cfd 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -2089,4 +2089,29 @@ public class CraftEventFactory { diff --git a/patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 94% rename from patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch index 75eeab264e..1a7f1ab11a 100644 --- a/patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch +++ b/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Fix HumanEntity#drop not updating the client inv public net.minecraft.server.level.ServerPlayer containerSynchronizer diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 196aa9dd610e7a10c35e0a532de012976829bb43..5b01ffcdbfff7dbd05143cb08479c90e9b29dfba 100644 +index e6326a7cefee568d7639cd3d0166910f8b965b80..8a6095850cece3203eeae474dbf32090f698a32e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -755,8 +755,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch similarity index 91% rename from patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch index fec2b2ac08..ea22d29006 100644 --- a/patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch +++ b/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle ArmorStand invisibility diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 273f3c029f878c8a30e4f0911d79195c023d3442..dc26be80f2c1f058451c0d446165bc78a0ff8c47 100644 +index 2c16cedf8cb2e4047415e056c419ed9c33c80e93..ccda0d7a96c201905f0f62dcb0e5b278a51dee9f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -152,6 +152,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { diff --git a/patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0923-Fix-text-display-error-on-spawn.patch b/patches/server/0922-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0923-Fix-text-display-error-on-spawn.patch rename to patches/server/0922-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0925-Add-Shearable-API.patch b/patches/server/0924-Add-Shearable-API.patch similarity index 92% rename from patches/server/0925-Add-Shearable-API.patch rename to patches/server/0924-Add-Shearable-API.patch index dbb764b5e7..53d2faf459 100644 --- a/patches/server/0925-Add-Shearable-API.patch +++ b/patches/server/0924-Add-Shearable-API.patch @@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..bcf254e3c81cf1e401bddc850fb24ad2 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java -index 7d9b8968334e536457b29be196545a1f4e312a83..efecddaa165decac6e0958b202ad838405220627 100644 +index ade11598bee28fea252e3500aaa1daefc506c175..7ee489da5963fd722fc2531fef14911447a16557 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java @@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer; @@ -45,7 +45,7 @@ index 7d9b8968334e536457b29be196545a1f4e312a83..efecddaa165decac6e0958b202ad8384 super(server, entity); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java -index c83f16868571ab4724201e9369ab8d90d0e280c5..19e8fc7fa6037b063bc1809c85c703996cd9b5ac 100644 +index 030bf7b6312799231d0b614ba5c84fec23c276e3..37291d7ad9fdf0fe78894f82a418f40bb581f58b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java @@ -4,7 +4,7 @@ import org.bukkit.DyeColor; @@ -58,7 +58,7 @@ index c83f16868571ab4724201e9369ab8d90d0e280c5..19e8fc7fa6037b063bc1809c85c70399 super(server, entity); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java -index 5d2e0fb911265f1184de5434464378ffba98d379..e4a14cdfeb91a3d32e622d27d612605b1bca08e2 100644 +index 1e9807b8f468742d208f817e22d7625106fc1b58..4ce2373ff71c3c1b8951646e057587a3ab09e145 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java @@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.SnowGolem; diff --git a/patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 94% rename from patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch index 4c90082c28..6a85431dfa 100644 --- a/patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch +++ b/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnEggMeta#get/setSpawnedType diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java -index 2f65ce5d63ea4ad3a0b1b8fa47efa97b6641ef20..3ab43aab043ae59e541f708c8558ddf9bdd82f84 100644 +index f4ae4f7b927679c58322f0ec582bb9a5f6c236ec..18b9dcdc2b4bfacd4705085c947a5204a7a3cca3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java @@ -216,6 +216,31 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { diff --git a/patches/server/0927-Optimize-Hoppers.patch b/patches/server/0926-Optimize-Hoppers.patch similarity index 99% rename from patches/server/0927-Optimize-Hoppers.patch rename to patches/server/0926-Optimize-Hoppers.patch index f74f8f0f52..1bb45392e9 100644 --- a/patches/server/0927-Optimize-Hoppers.patch +++ b/patches/server/0926-Optimize-Hoppers.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b5ffa564cf6389b6af281ecf12b8daa139861608..0dbfe7e9c57e0ff52d30ccce3ae3a6af413b7aa4 100644 +index ebc35224004375b77039342926876a408995b04d..9fff00b3706a97ba71a80f2ba39577b229325e02 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1509,6 +1509,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { serialized.gameMode = GameType.byId(buf.readVarInt()); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f70ab11877ae04a4c9cc4ef61dc6e07c0f3fe9f2..93d84ca1d132222c8daed9d2683bf72f95dbb078 100644 +index f06cbdef43e70cde315b0b4cb2d124efa1071618..ba257447048b9322defaecfd7424579f287ff483 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -284,6 +284,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 90% rename from patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch index 960d48879a..b0bdc70fe9 100644 --- a/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch +++ b/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 42f0ea87dd0bb3be3fbe9e0f7d87582cd3cd7c97..2858fe182e617429f7dcbd7b5d2d2f5df722d5bb 100644 +index a1f25978c50b9b924fda0e399ec7eb5a58562c1b..d38559bd6071e2e37dea46068ead80a24702ff3b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1696,6 +1696,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0934-Use-array-for-gamerule-storage.patch b/patches/server/0933-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0934-Use-array-for-gamerule-storage.patch rename to patches/server/0933-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0937-Add-Mob-Experience-reward-API.patch b/patches/server/0936-Add-Mob-Experience-reward-API.patch similarity index 89% rename from patches/server/0937-Add-Mob-Experience-reward-API.patch rename to patches/server/0936-Add-Mob-Experience-reward-API.patch index 47d2f879f2..941296a95c 100644 --- a/patches/server/0937-Add-Mob-Experience-reward-API.patch +++ b/patches/server/0936-Add-Mob-Experience-reward-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Mob Experience reward API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index c526304d31fd9be1b3c895187f7d9fc45edf4866..153e4c88c168097eb4a78650e7c9c120bec202a3 100644 +index 40d277f2737f1a060c3047313289c73307948e73..b4e45d8e9851552f30c9c29d3d9671e1e9094c38 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -158,4 +158,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { diff --git a/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch similarity index 96% rename from patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch index 461e4c40ca..ff295ff960 100644 --- a/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch +++ b/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch @@ -7,7 +7,7 @@ This logic hooks into the neighbour update which should be invoked as a result of redstone powering the trap door. diff --git a/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java b/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java -index aa3fdadd1cc2200adb6e0cf523c38833dc01b71b..b9e3c9cd709d42bced85436720ccc7b9c7e49552 100644 +index 761bbb448acf1c3bf03d728f1a285b89963e61e1..d2f3af70449b0b24734433533167cae444ec4bde 100644 --- a/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java @@ -124,7 +124,26 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW diff --git a/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch similarity index 92% rename from patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch index 6490952e0e..7fe63b9f63 100644 --- a/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch +++ b/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a2af7cdc6e538e844f354b2acb30ae3d6e103533..7c0fec2df265bc72cb5e2f8f400c6ad4c128705e 100644 +index 4ad092c25a17cfb3eae26316260ddeeb66a59cfd..1d9efbde8ec52965bbed22d82a095aa73b8db3b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1086,6 +1086,11 @@ public class CraftEventFactory { diff --git a/patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0941-More-accurate-isInOpenWater-impl.patch b/patches/server/0940-More-accurate-isInOpenWater-impl.patch similarity index 93% rename from patches/server/0941-More-accurate-isInOpenWater-impl.patch rename to patches/server/0940-More-accurate-isInOpenWater-impl.patch index c782627938..ca26fd9045 100644 --- a/patches/server/0941-More-accurate-isInOpenWater-impl.patch +++ b/patches/server/0940-More-accurate-isInOpenWater-impl.patch @@ -13,7 +13,7 @@ public net.minecraft.world.entity.projectile.FishingHook calculateOpenWater(Lnet public net.minecraft.world.entity.projectile.FishingHook outOfWaterTime diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java -index 9de72665c947bb00547cdd7c41a890711f5b2afc..96b6e537ec4493a0cdd98ccfe7816f7ffb69c7dd 100644 +index ad1aeea80877f2cdb9e8ad9c5b46f95dd76b3335..116f23a3ee9fa409d7bc34c3769b94ed2bb07183 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java @@ -164,7 +164,7 @@ public class CraftFishHook extends CraftProjectile implements FishHook { diff --git a/patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0944-Expand-PlayerItemMendEvent.patch b/patches/server/0943-Expand-PlayerItemMendEvent.patch similarity index 98% rename from patches/server/0944-Expand-PlayerItemMendEvent.patch rename to patches/server/0943-Expand-PlayerItemMendEvent.patch index 88077775bf..0b4ee58ae8 100644 --- a/patches/server/0944-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0943-Expand-PlayerItemMendEvent.patch @@ -51,7 +51,7 @@ index 42c6288d26dc866dae19031aa3310d88274a6fbf..2981475368094b7749cfec2e5a99ec09 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7c0fec2df265bc72cb5e2f8f400c6ad4c128705e..c562a0a970c83df3bfd4d600bb0ee97878b1649c 100644 +index 1d9efbde8ec52965bbed22d82a095aa73b8db3b8..c87849a4da75c5a0cbe56bb61a288252101a020f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1322,10 +1322,10 @@ public class CraftEventFactory { diff --git a/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch similarity index 97% rename from patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch index d93fc48631..87276faa87 100644 --- a/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch +++ b/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch @@ -14,7 +14,7 @@ clearing the owner. Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5dc48c6cced218be3428b420f4823330ea84ba0a..c6fe58b0ce9d0847d139e72316ed271aa6be2d92 100644 +index 11a4d679c5b46f52eeb51b844f240a835027216a..f37790f7f461da9ecdbd1e83d7ac7832bc5c5eda 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -382,6 +382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0946-Add-transient-modifier-API.patch b/patches/server/0945-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0946-Add-transient-modifier-API.patch rename to patches/server/0945-Add-transient-modifier-API.patch diff --git a/patches/server/0947-Fix-block-place-logic.patch b/patches/server/0946-Fix-block-place-logic.patch similarity index 97% rename from patches/server/0947-Fix-block-place-logic.patch rename to patches/server/0946-Fix-block-place-logic.patch index d08e5291bc..a1c7cee366 100644 --- a/patches/server/0947-Fix-block-place-logic.patch +++ b/patches/server/0946-Fix-block-place-logic.patch @@ -41,7 +41,7 @@ index c73b57ffd622ccc2e6c570cf874ed118108b899b..efa73faab21c301a99cfe58c3d822d96 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 487a25ca0f6719742a88648fbbebfc3e29e105f5..2dbc5898338a2ee5e2ca7f05fd6de77033be4eb7 100644 +index 6942c0e42814b995971bbe9bd3bd396e121989dd..169fc7b1aaf2cefec3ddab53fcec912e0ec0117a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1035,17 +1035,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0953-Fix-sniffer-removeExploredLocation.patch b/patches/server/0952-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0953-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0952-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch similarity index 91% rename from patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch index 570cabfbfd..7b09037690 100644 --- a/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index bb5980b7e265860968bc86216f2f3ad47301830c..daadfec2d86f7957072a639e1e36d4082448f35f 100644 +index 6a4639a4584f3497661f8870d5722e300638e52a..030fd330b13197d752a2d4c48628b9efd2c2c776 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -503,6 +503,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 91% rename from patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch index f4cceaa358..466d256466 100644 --- a/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch +++ b/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Temp: Pre-init PlayerChunkLoaderData in order to prepopulate diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index cac89e4a445262b97c727640d1593a3d74e82b72..e4cacb17f56c618bef19e1165c07aac86af61150 100644 +index c8ae7b3eab18cc9e7be4e92200fb3ac345216357..2af0068ef338634d1f44532af5db66c2d0b3dd10 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -367,6 +367,7 @@ public class Main { diff --git a/patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0957-Properly-Cancel-Usable-Items.patch b/patches/server/0956-Properly-Cancel-Usable-Items.patch similarity index 92% rename from patches/server/0957-Properly-Cancel-Usable-Items.patch rename to patches/server/0956-Properly-Cancel-Usable-Items.patch index 655263e5a7..ac735f5582 100644 --- a/patches/server/0957-Properly-Cancel-Usable-Items.patch +++ b/patches/server/0956-Properly-Cancel-Usable-Items.patch @@ -10,7 +10,7 @@ The underlying issue of this is that the client modifies their synced data value them in order for the client to reset their using item state. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 34ecfb89372f459117db99d57a7edd6f681bbe8a..baf3e79489e310f443788bc917c553ae7ea86c89 100644 +index 4b1af7bba3ce10a1247bb61535456510e18da2d9..76cef8f2861af8fcb88b4dad294a8853dd3f3e01 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -562,6 +562,7 @@ public class ServerPlayerGameMode { @@ -34,7 +34,7 @@ index 34ecfb89372f459117db99d57a7edd6f681bbe8a..baf3e79489e310f443788bc917c553ae return enuminteractionresult; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 93d84ca1d132222c8daed9d2683bf72f95dbb078..2af12e7dddf872f3b80d6288c0b1bd47fcd2b2f7 100644 +index ba257447048b9322defaecfd7424579f287ff483..bb74c271acc02d4f750daeb05bc05b1d6f61ffeb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1923,6 +1923,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -46,7 +46,7 @@ index 93d84ca1d132222c8daed9d2683bf72f95dbb078..2af12e7dddf872f3b80d6288c0b1bd47 return; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0af0a1ee44375e17942f641df49c53c7804c50fc..9cc236acc47b54f84f0ad9137bfa4b7c38412a5c 100644 +index 371f6d2539eac7161a86bb64763b4ee228eccbdf..6d4d46163ffcffa98f400c2656703eb5c4818f40 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3811,6 +3811,11 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0958-Add-event-for-player-editing-sign.patch b/patches/server/0957-Add-event-for-player-editing-sign.patch similarity index 98% rename from patches/server/0958-Add-event-for-player-editing-sign.patch rename to patches/server/0957-Add-event-for-player-editing-sign.patch index 32a1b7ae72..d8b7be275f 100644 --- a/patches/server/0958-Add-event-for-player-editing-sign.patch +++ b/patches/server/0957-Add-event-for-player-editing-sign.patch @@ -72,7 +72,7 @@ index 1a1f57cad2eeb5fa1d57e6a07e201ee77065ec90..0c1c6fbcf625da4a28514e0d040deb6c entityhuman.openTextEdit(tileentitysign, flag); } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index c4fb012488202769ea221d66a8f05cb949b6c815..975c107ccb27e0e5bcd125bb59593a86d730fa43 100644 +index 94caa0915e1a9ec1c46c7a0380db840901cc8063..3b33aed51a84ee30b1e7bceecb0d3840866e0748 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -139,9 +139,15 @@ public class CraftSign extends CraftBlockEntityState< diff --git a/patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0960-Improve-command-function-perm-level-checks.patch b/patches/server/0959-Improve-command-function-perm-level-checks.patch similarity index 100% rename from patches/server/0960-Improve-command-function-perm-level-checks.patch rename to patches/server/0959-Improve-command-function-perm-level-checks.patch diff --git a/patches/server/0961-Add-option-to-disable-block-updates.patch b/patches/server/0960-Add-option-to-disable-block-updates.patch similarity index 99% rename from patches/server/0961-Add-option-to-disable-block-updates.patch rename to patches/server/0960-Add-option-to-disable-block-updates.patch index ae431df4ef..29e45a4f7d 100644 --- a/patches/server/0961-Add-option-to-disable-block-updates.patch +++ b/patches/server/0960-Add-option-to-disable-block-updates.patch @@ -108,7 +108,7 @@ index 910864cfeac085648e6c671b0f9480417324d36e..e46d84750bdd7c940f400efda226e12a this.playNote(player, state, world, pos); player.awardStat(Stats.TUNE_NOTEBLOCK); diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java -index 7f60175bf671d282c11e9084670d2bb900968255..cb2ff8d94308c637a498d2737f86f6af4c9c1b83 100644 +index a4ceb86f2c1bbd7d76d07532ed8a512722b01381..d78e5c5014f2af8c14ba5896d94b3100aaecedf9 100644 --- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java @@ -53,6 +53,7 @@ public class TripWireBlock extends Block { diff --git a/patches/server/0962-Call-missing-BlockDispenseEvent.patch b/patches/server/0961-Call-missing-BlockDispenseEvent.patch similarity index 98% rename from patches/server/0962-Call-missing-BlockDispenseEvent.patch rename to patches/server/0961-Call-missing-BlockDispenseEvent.patch index fa4ada4143..2496dada5e 100644 --- a/patches/server/0962-Call-missing-BlockDispenseEvent.patch +++ b/patches/server/0961-Call-missing-BlockDispenseEvent.patch @@ -50,7 +50,7 @@ index c0baec6ae9bd90410f47aa04d7c7704233375d1a..e9b748a81ec223a701b56d2dc890c9eb for (int k = 0; k < 5; ++k) { worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c562a0a970c83df3bfd4d600bb0ee97878b1649c..3d93dae82d6fb6bc6abed4f32cf9da32f9159ba6 100644 +index c87849a4da75c5a0cbe56bb61a288252101a020f..8eaa16ef67cbbdc06ae74e1f3c9489d205092264 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -2095,6 +2095,32 @@ public class CraftEventFactory { diff --git a/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 90% rename from patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch index faca8da061..21461515af 100644 --- a/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch +++ b/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c6fe58b0ce9d0847d139e72316ed271aa6be2d92..aa668d0451d96d2f59e3da19e3ae1bd340e17d81 100644 +index f37790f7f461da9ecdbd1e83d7ac7832bc5c5eda..1188fafa153992c9f2d23d22f1faaed3e2c4a1db 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1356,7 +1356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0964-Optimize-player-lookups-for-beacons.patch b/patches/server/0963-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0964-Optimize-player-lookups-for-beacons.patch rename to patches/server/0963-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0965-Add-Sign-getInteractableSideFor.patch b/patches/server/0964-Add-Sign-getInteractableSideFor.patch similarity index 96% rename from patches/server/0965-Add-Sign-getInteractableSideFor.patch rename to patches/server/0964-Add-Sign-getInteractableSideFor.patch index 2d3d9a47fb..0a4aadfb36 100644 --- a/patches/server/0965-Add-Sign-getInteractableSideFor.patch +++ b/patches/server/0964-Add-Sign-getInteractableSideFor.patch @@ -30,7 +30,7 @@ index e34f7426df5d6c94fcc4101b28702e6c1d9fccff..9eea2982e92e9bc7a53962dc6b21de60 float f1 = (float) (Mth.atan2(d1, d0) * 57.2957763671875D) - 90.0F; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index 975c107ccb27e0e5bcd125bb59593a86d730fa43..736f76f31abedc051ec511524a55da98b77d111d 100644 +index 3b33aed51a84ee30b1e7bceecb0d3840866e0748..2a70c68af92967851f5caf8e67e433355ff48d44 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -169,6 +169,14 @@ public class CraftSign extends CraftBlockEntityState< diff --git a/patches/server/0966-Array-backed-synched-entity-data.patch b/patches/server/0965-Array-backed-synched-entity-data.patch similarity index 96% rename from patches/server/0966-Array-backed-synched-entity-data.patch rename to patches/server/0965-Array-backed-synched-entity-data.patch index 515a256250..84bf2095b4 100644 --- a/patches/server/0966-Array-backed-synched-entity-data.patch +++ b/patches/server/0965-Array-backed-synched-entity-data.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Array backed synched entity data Original code by jellysquid3 in Lithium, licensed under the GNU Lesser General Public License v3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java -index 15add3f4dfd718ec09bb1db4f22223466936879c..5dfb35117c285e0b202dc9c088ad5848beb8d054 100644 +index ccb7d92b6c36b6225a2e640f8cea6c0da37464c8..a043c382c37058032548a5192e17f5f816abe5a6 100644 --- a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java +++ b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java @@ -34,6 +34,11 @@ public class SynchedEntityData { diff --git a/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch similarity index 95% rename from patches/server/0967-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0966-fix-item-meta-for-tadpole-buckets.patch index 08907c84fd..c1d43316d3 100644 --- a/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch +++ b/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch @@ -17,7 +17,7 @@ index 6e91c7ccc36e088be60739dd71b287f0b922a055..57f4cf40359fe9bb427eb0134660d008 case GLOW_ITEM_FRAME: case PAINTING: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index ce82f313007762b6d1d9f006f21a8858e2976efb..0e5abd2a8694b24d4077a602a544e9c2b4c31822 100644 +index b758cf51923f9e227c287680287dc18525bed4a0..ff9e42299d46764cd53f72c730716102c6b8aa3c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -600,6 +600,7 @@ public final class CraftItemStack extends ItemStack { @@ -29,7 +29,7 @@ index ce82f313007762b6d1d9f006f21a8858e2976efb..0e5abd2a8694b24d4077a602a544e9c2 case GLOW_ITEM_FRAME: case PAINTING: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java -index e65bdbbbedb91eca016d46de5cc7cbb70dd9f659..9024467a627a40a145a951510f2207e2a175a4ab 100644 +index 6aa64334943a22da8cfcac88d48ae8156ad7a9b4..630e16403cb1fc0f4ba798993bb0c3139196a97c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java @@ -16,6 +16,7 @@ public class CraftMetaEntityTag extends CraftMetaItem { diff --git a/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch similarity index 98% rename from patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch rename to patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch index 4e1d19bbf6..660669617a 100644 --- a/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch +++ b/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch @@ -67,7 +67,7 @@ index f6d2785b05b4c0a4393be706a90d7cc4388399bf..2510297df2f6ca80672c1dcbd35c0b1e continue; } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 6398f31a29fdab0f6539139a09336b10d6d11d95..7e85f896dc243b2811ea87df759dffa9b6f495b3 100644 +index b6550a8c52122747668f9f0e93c2c2cbd2e86d94..77a789ada9c76c40aabfda358e0752db63a63da9 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -71,11 +71,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { diff --git a/patches/server/0969-Fix-BanList-API.patch b/patches/server/0968-Fix-BanList-API.patch similarity index 100% rename from patches/server/0969-Fix-BanList-API.patch rename to patches/server/0968-Fix-BanList-API.patch diff --git a/patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0971-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0971-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0970-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 96% rename from patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch index 1408560f1a..d72ec05289 100644 --- a/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch +++ b/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Only set despawnTimer for Wandering Traders spawned by diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 1cef116b692ebdf3ade01cde533d1e5182a05a91..3c2941d799c9acb3dd9e2b67b7092f4bba5ede17 100644 +index 96115fe8a8c32ce5992d779b5db540b9d81e3b82..833563e237462ccfc1b730b8f5fb35340d0db854 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java @@ -67,7 +67,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill diff --git a/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 93% rename from patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch index 24e77389a5..49b157ea07 100644 --- a/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch +++ b/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f08abdff3e190391d2b65e32e45eb391aeb4f346..def4d88b227b8764a84392843a2f0a026f9ee3fc 100644 +index 8eaa16ef67cbbdc06ae74e1f3c9489d205092264..3ac67ef07f574eacc09d8dc966800cb94caea3c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -720,7 +720,10 @@ public class CraftEventFactory { diff --git a/patches/server/0974-Don-t-tick-signs.patch b/patches/server/0973-Don-t-tick-signs.patch similarity index 100% rename from patches/server/0974-Don-t-tick-signs.patch rename to patches/server/0973-Don-t-tick-signs.patch diff --git a/patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0976-Add-whitelist-events.patch b/patches/server/0975-Add-whitelist-events.patch similarity index 100% rename from patches/server/0976-Add-whitelist-events.patch rename to patches/server/0975-Add-whitelist-events.patch diff --git a/patches/server/0977-Implement-PlayerFailMoveEvent.patch b/patches/server/0976-Implement-PlayerFailMoveEvent.patch similarity index 98% rename from patches/server/0977-Implement-PlayerFailMoveEvent.patch rename to patches/server/0976-Implement-PlayerFailMoveEvent.patch index 42ea363200..9feef646bd 100644 --- a/patches/server/0977-Implement-PlayerFailMoveEvent.patch +++ b/patches/server/0976-Implement-PlayerFailMoveEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2af12e7dddf872f3b80d6288c0b1bd47fcd2b2f7..6e23c295f77e95564bf132a03397c4640bf9f49e 100644 +index bb74c271acc02d4f750daeb05bc05b1d6f61ffeb..a51ba56ff7072a0fcaf7115486a61c2ea955e6c1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1291,8 +1291,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch b/patches/server/0977-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/server/0978-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0977-Folia-scheduler-and-owned-region-API.patch index 060b9e9c77..d407af42b5 100644 --- a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0977-Folia-scheduler-and-owned-region-API.patch @@ -1121,7 +1121,7 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0dbfe7e9c57e0ff52d30ccce3ae3a6af413b7aa4..8f0769d248c7f3cce753130147223403c7923304 100644 +index 9fff00b3706a97ba71a80f2ba39577b229325e02..1bac9f7894321b5710f5475f6598ec9f3ccd94d3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1466,6 +1466,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2858fe182e617429f7dcbd7b5d2d2f5df722d5bb..00b3d8cdf22ef6e1b6b93dc6ba228a9d8c918e6b 100644 +index d38559bd6071e2e37dea46068ead80a24702ff3b..ee6d9c19dbc01d46c60d0067664266c203087d8e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -564,6 +564,17 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -52,7 +52,7 @@ index 2858fe182e617429f7dcbd7b5d2d2f5df722d5bb..00b3d8cdf22ef6e1b6b93dc6ba228a9d // Add env and gen to constructor, IWorldDataServer -> WorldDataServer public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..b2c2bd5ec0afd479973f7237a5c610f21231c505 100644 +index cd57234a5f1131f48c9726f89262f253e61b9811..106a312aba249d1e83e4b535fc6e741e04ccfd14 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -124,7 +124,7 @@ public class ServerPlayerGameMode { @@ -65,7 +65,7 @@ index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..b2c2bd5ec0afd479973f7237a5c610f2 if (this.hasDelayedDestroy) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9cc236acc47b54f84f0ad9137bfa4b7c38412a5c..24a9cdcd7edd2d9e9b002fd2449a7d80057c5ad7 100644 +index 6d4d46163ffcffa98f400c2656703eb5c4818f40..675d695989cef5d8fc2e85673efbb57ec1bb38bd 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3816,6 +3816,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/1029-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/1029-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/1030-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/1030-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/1031-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 94% rename from patches/server/1031-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch index f4bcaa50c7..6aa46a84f6 100644 --- a/patches/server/1031-Fix-team-sidebar-objectives-not-being-cleared.patch +++ b/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch @@ -9,7 +9,7 @@ scoreboards. If a player's scoreboard has a displayed objective for the still had a 'gold' team, it would still be displayed diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java -index 628951be16da8f19f0e1a974a0b4efa86e873b99..7a2f46579352870cfbb32c343d7c68919758ffe3 100644 +index 24c5e6e3dd41e72d22819964bc8e77f0ebc2d089..891f850ea99dac1433f3e395e26be14c8abf2bfb 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -87,8 +87,8 @@ public final class CraftScoreboardManager implements ScoreboardManager { diff --git a/patches/server/1032-Optimise-nearby-player-retrieval.patch b/patches/server/1031-Optimise-nearby-player-retrieval.patch similarity index 98% rename from patches/server/1032-Optimise-nearby-player-retrieval.patch rename to patches/server/1031-Optimise-nearby-player-retrieval.patch index 5486dc0f16..114dfb6f4d 100644 --- a/patches/server/1032-Optimise-nearby-player-retrieval.patch +++ b/patches/server/1031-Optimise-nearby-player-retrieval.patch @@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce the number of tests per search. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 00b3d8cdf22ef6e1b6b93dc6ba228a9d8c918e6b..2f2ca1c6d0b329521c4545015a878418870216f0 100644 +index ee6d9c19dbc01d46c60d0067664266c203087d8e..19ffb121934e9249d18fa53cae1ae892dfd7f8d4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -575,6 +575,115 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/1033-Remove-streams-for-villager-AI.patch b/patches/server/1032-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/1033-Remove-streams-for-villager-AI.patch rename to patches/server/1032-Remove-streams-for-villager-AI.patch diff --git a/patches/server/1034-Fix-missing-map-initialize-event-call.patch b/patches/server/1033-Fix-missing-map-initialize-event-call.patch similarity index 96% rename from patches/server/1034-Fix-missing-map-initialize-event-call.patch rename to patches/server/1033-Fix-missing-map-initialize-event-call.patch index e9765c3029..76a90f7aec 100644 --- a/patches/server/1034-Fix-missing-map-initialize-event-call.patch +++ b/patches/server/1033-Fix-missing-map-initialize-event-call.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing map initialize event call diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2f2ca1c6d0b329521c4545015a878418870216f0..17610196db7a1c6feb2cf74a02479a8691aa323f 100644 +index 19ffb121934e9249d18fa53cae1ae892dfd7f8d4..584a768f2ce1c98a1de7749060c47f21721f9055 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2100,7 +2100,23 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/1035-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 92% rename from patches/server/1035-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch index de60d2ea6f..40c89bc2cc 100644 --- a/patches/server/1035-Update-entity-data-when-attaching-firework-to-entity.patch +++ b/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Update entity data when attaching firework to entity public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ATTACHED_TO_TARGET diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 68c5af9b67a2834ee6e2f80ceefa19c3a982b8ed..1605ac0e726accdbd7953ffb95a302c2a21d64ce 100644 +index 13b09465952dca2e95647ddb9753a7fe2db51720..c13cdbaf7abdf120a3969f8e887b4c3b78989c9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -69,6 +69,10 @@ public class CraftFirework extends CraftProjectile implements Firework { diff --git a/patches/server/1036-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch similarity index 100% rename from patches/server/1036-Use-correct-variable-for-initializing-CraftLootTable.patch rename to patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch diff --git a/patches/server/1037-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch similarity index 100% rename from patches/server/1037-Make-setVelocity-method-of-Fireballs-change-the-trav.patch rename to patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch diff --git a/patches/server/1038-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch similarity index 96% rename from patches/server/1038-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch index 0aecd72d28..2b7c0f8110 100644 --- a/patches/server/1038-Fix-UnsafeValues-loadAdvancement.patch +++ b/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix UnsafeValues#loadAdvancement diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 4d66a9f24d718de4c6862b20ccb7240332523db4..6b31f88803041c75023a2c99bdc1efd902f0205c 100644 +index 4d66a9f24d718de4c6862b20ccb7240332523db4..548c77592a3520e8053483644eba805079a14f1a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -319,7 +319,27 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/1039-Add-player-idle-duration-API.patch b/patches/server/1038-Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/1039-Add-player-idle-duration-API.patch rename to patches/server/1038-Add-player-idle-duration-API.patch diff --git a/patches/server/1040-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1039-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/1040-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/1039-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/1041-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/1041-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/1042-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/1042-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/1043-Optimize-VarInts.patch b/patches/server/1042-Optimize-VarInts.patch similarity index 100% rename from patches/server/1043-Optimize-VarInts.patch rename to patches/server/1042-Optimize-VarInts.patch diff --git a/patches/server/1044-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch b/patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch similarity index 100% rename from patches/server/1044-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch rename to patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch