diff --git a/patches/server/0330-PreCreatureSpawnEvent.patch b/patches/server/0173-PreCreatureSpawnEvent.patch similarity index 97% rename from patches/server/0330-PreCreatureSpawnEvent.patch rename to patches/server/0173-PreCreatureSpawnEvent.patch index f15e5b7e0..d68ee45bd 100644 --- a/patches/server/0330-PreCreatureSpawnEvent.patch +++ b/patches/server/0173-PreCreatureSpawnEvent.patch @@ -66,7 +66,7 @@ index 6a9e2105b2d9a4ee83c0a2516d5ef26dc3b99053..aec77679584a2acab5818e26e2586b53 if (entityirongolem != null) { diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index c6298b12e4e0c20be20e7e493be728f028f9eb31..68ce2732dfdc25ddadc15c43c30a609f9b1eba86 100644 +index 12a78685848b7fd945a472902d8200ea1d50b9ec..cfb820636f819a7da56d0302d49f39cea1b5a93d 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -132,6 +132,27 @@ public abstract class BaseSpawner { @@ -97,13 +97,13 @@ index c6298b12e4e0c20be20e7e493be728f028f9eb31..68ce2732dfdc25ddadc15c43c30a609f Entity entity = EntityType.loadEntityRecursive(nbttagcompound, world, (entity1) -> { entity1.moveTo(d0, d1, d2, entity1.getYRot(), entity1.getXRot()); return entity1; -@@ -349,3 +370,4 @@ public abstract class BaseSpawner { +@@ -326,3 +347,4 @@ public abstract class BaseSpawner { return this.oSpin; } } + diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 30ba1e3cb75d994770b006b9dfd6669000a9c1a4..6204bf41d410df9784b32f993b46d7adb2af5f13 100644 +index 59fae60116167baf989e85596334824e9004e6fb..be667bb12e1ee186b8d9ad1d7ac4534454d0e787 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -231,7 +231,13 @@ public final class NaturalSpawner { diff --git a/patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0174-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0174-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0174-Fill-Profile-Property-Events.patch b/patches/server/0175-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0174-Fill-Profile-Property-Events.patch rename to patches/server/0175-Fill-Profile-Property-Events.patch diff --git a/patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0176-Add-ArmorStand-Item-Meta.patch b/patches/server/0177-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0176-Add-ArmorStand-Item-Meta.patch rename to patches/server/0177-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0177-Extend-Player-Interact-cancellation.patch b/patches/server/0178-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0177-Extend-Player-Interact-cancellation.patch rename to patches/server/0178-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0178-Tameable-getOwnerUniqueId-API.patch b/patches/server/0179-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0178-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0179-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0181-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0182-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0181-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0182-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0182-Improved-Async-Task-Scheduler.patch b/patches/server/0183-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0182-Improved-Async-Task-Scheduler.patch rename to patches/server/0183-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/server/0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0184-Player.setPlayerProfile-API.patch b/patches/server/0185-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/0184-Player.setPlayerProfile-API.patch rename to patches/server/0185-Player.setPlayerProfile-API.patch diff --git a/patches/server/0185-getPlayerUniqueId-API.patch b/patches/server/0186-getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/0185-getPlayerUniqueId-API.patch rename to patches/server/0186-getPlayerUniqueId-API.patch diff --git a/patches/server/0186-Make-player-data-saving-configurable.patch b/patches/server/0187-Make-player-data-saving-configurable.patch similarity index 100% rename from patches/server/0186-Make-player-data-saving-configurable.patch rename to patches/server/0187-Make-player-data-saving-configurable.patch diff --git a/patches/server/0187-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0188-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0187-Make-legacy-ping-handler-more-reliable.patch rename to patches/server/0188-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0189-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/0189-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0189-Flag-to-disable-the-channel-limit.patch b/patches/server/0190-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/0189-Flag-to-disable-the-channel-limit.patch rename to patches/server/0190-Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/0190-Add-method-to-open-already-placed-sign.patch b/patches/server/0191-Add-method-to-open-already-placed-sign.patch similarity index 100% rename from patches/server/0190-Add-method-to-open-already-placed-sign.patch rename to patches/server/0191-Add-method-to-open-already-placed-sign.patch diff --git a/patches/server/0191-Configurable-sprint-interruption-on-attack.patch b/patches/server/0192-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0191-Configurable-sprint-interruption-on-attack.patch rename to patches/server/0192-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 93% rename from patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index a1458e6d9..b08e17190 100644 --- a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 205e4ef25f49edc11a408c302d9ba68a59c68a5a..35a00a622ff0c3582e08dbbefb1d34a84e590a81 100644 +index 5b426265d62063544f0104c8c9f8061d002bc56c..d5c3c97e5205ef94578bc2d9d39f1a4c2600db94 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2787,9 +2787,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0193-EndermanEscapeEvent.patch b/patches/server/0194-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0193-EndermanEscapeEvent.patch rename to patches/server/0194-EndermanEscapeEvent.patch diff --git a/patches/server/0194-Enderman.teleportRandomly.patch b/patches/server/0195-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0194-Enderman.teleportRandomly.patch rename to patches/server/0195-Enderman.teleportRandomly.patch diff --git a/patches/server/0195-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0196-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/0195-Block-Enderpearl-Travel-Exploit.patch rename to patches/server/0196-Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0197-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/server/0197-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/server/0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0198-EndermanAttackPlayerEvent.patch b/patches/server/0199-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0198-EndermanAttackPlayerEvent.patch rename to patches/server/0199-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0199-WitchConsumePotionEvent.patch b/patches/server/0200-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0199-WitchConsumePotionEvent.patch rename to patches/server/0200-WitchConsumePotionEvent.patch diff --git a/patches/server/0200-WitchThrowPotionEvent.patch b/patches/server/0201-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0200-WitchThrowPotionEvent.patch rename to patches/server/0201-WitchThrowPotionEvent.patch diff --git a/patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0202-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/server/0202-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0202-WitchReadyPotionEvent.patch b/patches/server/0203-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0202-WitchReadyPotionEvent.patch rename to patches/server/0203-WitchReadyPotionEvent.patch diff --git a/patches/server/0203-ItemStack-getMaxItemUseDuration.patch b/patches/server/0204-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0203-ItemStack-getMaxItemUseDuration.patch rename to patches/server/0204-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0205-Implement-EntityTeleportEndGatewayEvent.patch similarity index 95% rename from patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/server/0205-Implement-EntityTeleportEndGatewayEvent.patch index 3c1584cc2..0fdb872e9 100644 --- a/patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch +++ b/patches/server/0205-Implement-EntityTeleportEndGatewayEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement EntityTeleportEndGatewayEvent diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java -index 2bf65c8da827c6bdbfb74a9d8ee5754584c40c53..f9cd4c28db815205e548ac59515cd80989741bab 100644 +index 07c786b3988a2cc3a7bd3910dd909b887395a194..370ec4cd08a50ad0b8154db9afcaa76ec741dcb2 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java @@ -225,9 +225,20 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { diff --git a/patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0206-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/0206-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0206-Fix-CraftEntity-hashCode.patch b/patches/server/0207-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0206-Fix-CraftEntity-hashCode.patch rename to patches/server/0207-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0208-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/server/0208-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0209-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/0209-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0209-Make-shield-blocking-delay-configurable.patch b/patches/server/0210-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0209-Make-shield-blocking-delay-configurable.patch rename to patches/server/0210-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0210-Improve-EntityShootBowEvent.patch b/patches/server/0211-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0210-Improve-EntityShootBowEvent.patch rename to patches/server/0211-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0211-PlayerReadyArrowEvent.patch b/patches/server/0212-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0211-PlayerReadyArrowEvent.patch rename to patches/server/0212-PlayerReadyArrowEvent.patch diff --git a/patches/server/0212-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch similarity index 100% rename from patches/server/0212-Implement-EntityKnockbackByEntityEvent.patch rename to patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch diff --git a/patches/server/0213-Expand-Explosions-API.patch b/patches/server/0214-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0213-Expand-Explosions-API.patch rename to patches/server/0214-Expand-Explosions-API.patch diff --git a/patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0215-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/server/0215-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0215-RangedEntity-API.patch b/patches/server/0216-RangedEntity-API.patch similarity index 100% rename from patches/server/0215-RangedEntity-API.patch rename to patches/server/0216-RangedEntity-API.patch diff --git a/patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0217-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0217-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0217-Implement-World.getEntity-UUID-API.patch b/patches/server/0218-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0217-Implement-World.getEntity-UUID-API.patch rename to patches/server/0218-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0218-InventoryCloseEvent-Reason-API.patch b/patches/server/0219-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/0218-InventoryCloseEvent-Reason-API.patch rename to patches/server/0219-InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/0219-Vex-get-setSummoner-API.patch b/patches/server/0220-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0219-Vex-get-setSummoner-API.patch rename to patches/server/0220-Vex-get-setSummoner-API.patch diff --git a/patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/0221-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0222-Avoid-item-merge-if-stack-size-above-max-stack-size.patch similarity index 100% rename from patches/server/0221-Avoid-item-merge-if-stack-size-above-max-stack-size.patch rename to patches/server/0222-Avoid-item-merge-if-stack-size-above-max-stack-size.patch diff --git a/patches/server/0222-Use-asynchronous-Log4j-2-loggers.patch b/patches/server/0223-Use-asynchronous-Log4j-2-loggers.patch similarity index 96% rename from patches/server/0222-Use-asynchronous-Log4j-2-loggers.patch rename to patches/server/0223-Use-asynchronous-Log4j-2-loggers.patch index 8c3742501..15fd44e4b 100644 --- a/patches/server/0222-Use-asynchronous-Log4j-2-loggers.patch +++ b/patches/server/0223-Use-asynchronous-Log4j-2-loggers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/build.gradle.kts b/build.gradle.kts -index ac607a3be84bc02dedb95cab9a5eace40e33b511..b967ab10155bbf26e864bedadb8ae2ab5fdd38c1 100644 +index daf0455eeb2ef3d2bf88b1177315133b571569bb..f0256fe4aea16c9e0d6f5eee360eeec36cfdeebd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,6 +42,7 @@ dependencies { diff --git a/patches/server/0223-add-more-information-to-Entity.toString.patch b/patches/server/0224-add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/0223-add-more-information-to-Entity.toString.patch rename to patches/server/0224-add-more-information-to-Entity.toString.patch diff --git a/patches/server/0224-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 100% rename from patches/server/0224-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch diff --git a/patches/server/0225-EnderDragon-Events.patch b/patches/server/0226-EnderDragon-Events.patch similarity index 100% rename from patches/server/0225-EnderDragon-Events.patch rename to patches/server/0226-EnderDragon-Events.patch diff --git a/patches/server/0226-PlayerElytraBoostEvent.patch b/patches/server/0227-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0226-PlayerElytraBoostEvent.patch rename to patches/server/0227-PlayerElytraBoostEvent.patch diff --git a/patches/server/0227-PlayerLaunchProjectileEvent.patch b/patches/server/0228-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0227-PlayerLaunchProjectileEvent.patch rename to patches/server/0228-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0228-Improve-BlockPosition-inlining.patch b/patches/server/0229-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0228-Improve-BlockPosition-inlining.patch rename to patches/server/0229-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0229-Optimize-IntIdentityHashBiMiap-nextId.patch b/patches/server/0230-Optimize-IntIdentityHashBiMiap-nextId.patch similarity index 100% rename from patches/server/0229-Optimize-IntIdentityHashBiMiap-nextId.patch rename to patches/server/0230-Optimize-IntIdentityHashBiMiap-nextId.patch diff --git a/patches/server/0230-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0230-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0231-Vanished-players-don-t-have-rights.patch b/patches/server/0232-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0231-Vanished-players-don-t-have-rights.patch rename to patches/server/0232-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0232-Allow-disabling-armour-stand-ticking.patch b/patches/server/0233-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0232-Allow-disabling-armour-stand-ticking.patch rename to patches/server/0233-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0233-SkeletonHorse-Additions.patch b/patches/server/0234-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0233-SkeletonHorse-Additions.patch rename to patches/server/0234-SkeletonHorse-Additions.patch diff --git a/patches/server/0234-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0235-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0234-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/server/0235-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0235-Implement-Expanded-ArmorStand-API.patch b/patches/server/0236-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0235-Implement-Expanded-ArmorStand-API.patch rename to patches/server/0236-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0236-AnvilDamageEvent.patch b/patches/server/0237-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0236-AnvilDamageEvent.patch rename to patches/server/0237-AnvilDamageEvent.patch diff --git a/patches/server/0237-Add-hand-to-bucket-events.patch b/patches/server/0238-Add-hand-to-bucket-events.patch similarity index 97% rename from patches/server/0237-Add-hand-to-bucket-events.patch rename to patches/server/0238-Add-hand-to-bucket-events.patch index 6bd934113..b18f26656 100644 --- a/patches/server/0237-Add-hand-to-bucket-events.patch +++ b/patches/server/0238-Add-hand-to-bucket-events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5751a9318867df781568dd92ad4f51d1f40bc23c..dae19715582d75d24744d44a87f94dd86f90c1c7 100644 +index 5a5733124bd8395bb996e9d5426c4a260fbeb1d3..8989b3153b0c849e189a8ff4ac4de6085e3a3db2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1419,15 +1419,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -139,16 +139,16 @@ index c1cf7f5bff2878281d4a9787ea7160e984268352..8d4f8719b30a66fbb68c9407ee848431 public boolean isClientSide() { return this.isClientSide; diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 59fae60116167baf989e85596334824e9004e6fb..9c079d32e81cabfa7b8b28e3e8d5741d8d951d79 100644 +index be667bb12e1ee186b8d9ad1d7ac4534454d0e787..cf6bcbe7d75a52fe509e3b6c6c24b64bf9d460ad 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -@@ -558,3 +558,4 @@ public final class NaturalSpawner { +@@ -580,3 +580,4 @@ public final class NaturalSpawner { void run(Mob entity, ChunkAccess chunk); } } + diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 966d06e2da7e6f9b4e78ca8ed02f3a6472bc8c05..a81fc5212648056766824113b372a7c772c19e5a 100644 +index c09c2c8ec2a4dd2e1eec5ecf97cbd8456b5ec3c9..bb006e6c703e5c4cfa16ca4ee4cf8463215c38b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -222,7 +222,7 @@ public class CraftEventFactory { diff --git a/patches/server/0238-Add-TNTPrimeEvent.patch b/patches/server/0239-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0238-Add-TNTPrimeEvent.patch rename to patches/server/0239-Add-TNTPrimeEvent.patch diff --git a/patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 98% rename from patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch index c88867bf3..eb1d793af 100644 --- a/patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch @@ -45,7 +45,7 @@ index 77a03abd59db4a43f6f2d59d4c7ef176e782f205..bd508025b771424c942fd856c31d520b + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 902eab82912b9a7002485f73df7ae25e370b7e25..6ea367295d07c444d7cce0366261a884d299185a 100644 +index 28f4c456936c378628336d4a36f1975476f7913f..b65fcc7519589c3bc5c5f5b5ec1db53a520ec39f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0240-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0241-MC-135506-Experience-should-save-as-Integers.patch similarity index 100% rename from patches/server/0240-MC-135506-Experience-should-save-as-Integers.patch rename to patches/server/0241-MC-135506-Experience-should-save-as-Integers.patch diff --git a/patches/server/0241-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0242-Fix-client-rendering-skulls-from-same-user.patch similarity index 100% rename from patches/server/0241-Fix-client-rendering-skulls-from-same-user.patch rename to patches/server/0242-Fix-client-rendering-skulls-from-same-user.patch diff --git a/patches/server/0242-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0243-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/server/0242-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0243-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/0243-Make-EnderDragon-implement-Mob.patch b/patches/server/0244-Make-EnderDragon-implement-Mob.patch similarity index 100% rename from patches/server/0243-Make-EnderDragon-implement-Mob.patch rename to patches/server/0244-Make-EnderDragon-implement-Mob.patch diff --git a/patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0245-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0245-Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/0247-Optimize-BlockPosition-helper-methods.patch b/patches/server/0248-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0247-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0248-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/server/0249-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch similarity index 100% rename from patches/server/0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch rename to patches/server/0249-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch diff --git a/patches/server/0249-Slime-Pathfinder-Events.patch b/patches/server/0250-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0249-Slime-Pathfinder-Events.patch rename to patches/server/0250-Slime-Pathfinder-Events.patch diff --git a/patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0251-Optimize-CraftBlockData-Creation.patch b/patches/server/0252-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0251-Optimize-CraftBlockData-Creation.patch rename to patches/server/0252-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0252-Optimize-MappedRegistry.patch b/patches/server/0253-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0252-Optimize-MappedRegistry.patch rename to patches/server/0253-Optimize-MappedRegistry.patch diff --git a/patches/server/0253-Add-PhantomPreSpawnEvent.patch b/patches/server/0254-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0253-Add-PhantomPreSpawnEvent.patch rename to patches/server/0254-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0254-Add-More-Creeper-API.patch b/patches/server/0255-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0254-Add-More-Creeper-API.patch rename to patches/server/0255-Add-More-Creeper-API.patch diff --git a/patches/server/0255-Inventory-removeItemAnySlot.patch b/patches/server/0256-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0255-Inventory-removeItemAnySlot.patch rename to patches/server/0256-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0257-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0258-Asynchronous-chunk-IO-and-loading.patch similarity index 100% rename from patches/server/0257-Asynchronous-chunk-IO-and-loading.patch rename to patches/server/0258-Asynchronous-chunk-IO-and-loading.patch diff --git a/patches/server/0258-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/0258-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0259-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/0259-Expose-attack-cooldown-methods-for-Player.patch rename to patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0260-Improve-death-events.patch b/patches/server/0261-Improve-death-events.patch similarity index 100% rename from patches/server/0260-Improve-death-events.patch rename to patches/server/0261-Improve-death-events.patch diff --git a/patches/server/0261-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0261-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0262-Mob-Pathfinding-API.patch b/patches/server/0263-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0262-Mob-Pathfinding-API.patch rename to patches/server/0263-Mob-Pathfinding-API.patch diff --git a/patches/server/0263-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0263-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0265-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/server/0265-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 95% rename from patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch index 169635a71..b1f9c57bd 100644 --- a/patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks also prevents if out of world border bounds diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 9c079d32e81cabfa7b8b28e3e8d5741d8d951d79..30ba1e3cb75d994770b006b9dfd6669000a9c1a4 100644 +index cf6bcbe7d75a52fe509e3b6c6c24b64bf9d460ad..6204bf41d410df9784b32f993b46d7adb2af5f13 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -188,9 +188,9 @@ public final class NaturalSpawner { diff --git a/patches/server/0267-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0267-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0268-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/0268-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0269-Honor-EntityAgeable.ageLock.patch b/patches/server/0270-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0269-Honor-EntityAgeable.ageLock.patch rename to patches/server/0270-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0270-Configurable-connection-throttle-kick-message.patch b/patches/server/0271-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0270-Configurable-connection-throttle-kick-message.patch rename to patches/server/0271-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0271-Hook-into-CB-plugin-rewrites.patch b/patches/server/0272-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0271-Hook-into-CB-plugin-rewrites.patch rename to patches/server/0272-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0272-Add-sun-related-API.patch b/patches/server/0273-Add-sun-related-API.patch similarity index 100% rename from patches/server/0272-Add-sun-related-API.patch rename to patches/server/0273-Add-sun-related-API.patch diff --git a/patches/server/0273-Add-LivingEntity-getTargetEntity.patch b/patches/server/0274-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0273-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0274-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0274-Turtle-API.patch b/patches/server/0275-Turtle-API.patch similarity index 100% rename from patches/server/0274-Turtle-API.patch rename to patches/server/0275-Turtle-API.patch diff --git a/patches/server/0275-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0276-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0275-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/server/0276-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0277-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0277-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0278-Add-more-Witch-API.patch b/patches/server/0279-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0278-Add-more-Witch-API.patch rename to patches/server/0279-Add-more-Witch-API.patch diff --git a/patches/server/0279-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0279-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0280-Here-s-Johnny.patch b/patches/server/0281-Here-s-Johnny.patch similarity index 100% rename from patches/server/0280-Here-s-Johnny.patch rename to patches/server/0281-Here-s-Johnny.patch diff --git a/patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0282-Reset-players-airTicks-on-respawn.patch b/patches/server/0283-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0282-Reset-players-airTicks-on-respawn.patch rename to patches/server/0283-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0285-Optimize-World-Time-Updates.patch b/patches/server/0286-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0285-Optimize-World-Time-Updates.patch rename to patches/server/0286-Optimize-World-Time-Updates.patch diff --git a/patches/server/0286-Restore-custom-InventoryHolder-support.patch b/patches/server/0287-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0286-Restore-custom-InventoryHolder-support.patch rename to patches/server/0287-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0287-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0288-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0287-Use-Vanilla-Minecart-Speeds.patch rename to patches/server/0288-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0288-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0289-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0288-Fix-SpongeAbsortEvent-handling.patch rename to patches/server/0289-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/0290-Make-the-default-permission-message-configurable.patch b/patches/server/0291-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0290-Make-the-default-permission-message-configurable.patch rename to patches/server/0291-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0292-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0293-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0292-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0293-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0293-force-entity-dismount-during-teleportation.patch b/patches/server/0294-force-entity-dismount-during-teleportation.patch similarity index 100% rename from patches/server/0293-force-entity-dismount-during-teleportation.patch rename to patches/server/0294-force-entity-dismount-during-teleportation.patch diff --git a/patches/server/0294-Add-more-Zombie-API.patch b/patches/server/0295-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0294-Add-more-Zombie-API.patch rename to patches/server/0295-Add-more-Zombie-API.patch diff --git a/patches/server/0295-Book-Size-Limits.patch b/patches/server/0296-Book-Size-Limits.patch similarity index 100% rename from patches/server/0295-Book-Size-Limits.patch rename to patches/server/0296-Book-Size-Limits.patch diff --git a/patches/server/0296-Add-PlayerConnectionCloseEvent.patch b/patches/server/0297-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0296-Add-PlayerConnectionCloseEvent.patch rename to patches/server/0297-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0297-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0298-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0297-Prevent-Enderman-from-loading-chunks.patch rename to patches/server/0298-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/0300-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/server/0301-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 100% rename from patches/server/0300-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to patches/server/0301-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch diff --git a/patches/server/0301-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/0301-Block-Entity-remove-from-being-called-on-Players.patch rename to patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/0302-BlockDestroyEvent.patch b/patches/server/0303-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0302-BlockDestroyEvent.patch rename to patches/server/0303-BlockDestroyEvent.patch diff --git a/patches/server/0303-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/0303-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/server/0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/0304-Limit-Client-Sign-length-more.patch b/patches/server/0305-Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/0304-Limit-Client-Sign-length-more.patch rename to patches/server/0305-Limit-Client-Sign-length-more.patch diff --git a/patches/server/0305-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from patches/server/0305-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to patches/server/0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/patches/server/0306-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0306-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0307-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0308-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0307-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0308-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0308-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/patches/server/0309-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 100% rename from patches/server/0308-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to patches/server/0309-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch diff --git a/patches/server/0309-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 100% rename from patches/server/0309-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to patches/server/0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch diff --git a/patches/server/0310-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0310-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0311-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 100% rename from patches/server/0311-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to patches/server/0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch diff --git a/patches/server/0312-Entity-getEntitySpawnReason.patch b/patches/server/0313-Entity-getEntitySpawnReason.patch similarity index 97% rename from patches/server/0312-Entity-getEntitySpawnReason.patch rename to patches/server/0313-Entity-getEntitySpawnReason.patch index fbcb73d40..20c369e13 100644 --- a/patches/server/0312-Entity-getEntitySpawnReason.patch +++ b/patches/server/0313-Entity-getEntitySpawnReason.patch @@ -93,10 +93,10 @@ index 8df9bd656374d0b43af378c61c1df7b951085b58..fcd3e6bfb4b1d0aefcb34eaec1212b08 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index 12a78685848b7fd945a472902d8200ea1d50b9ec..3aadcb472ab808ee981065ddfa86be6cbf38c8d9 100644 +index cfb820636f819a7da56d0302d49f39cea1b5a93d..9a8af1867315840518533381e594fc50542cd72d 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java -@@ -167,6 +167,7 @@ public abstract class BaseSpawner { +@@ -188,6 +188,7 @@ public abstract class BaseSpawner { // Spigot End } entity.spawnedViaMobSpawner = true; // Paper diff --git a/patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch similarity index 100% rename from patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch rename to patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch diff --git a/patches/server/0314-Fire-event-on-GS4-query.patch b/patches/server/0315-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0314-Fire-event-on-GS4-query.patch rename to patches/server/0315-Fire-event-on-GS4-query.patch diff --git a/patches/server/0315-Implement-PlayerPostRespawnEvent.patch b/patches/server/0316-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0315-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0316-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0316-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0316-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0317-Server-Tick-Events.patch b/patches/server/0318-Server-Tick-Events.patch similarity index 100% rename from patches/server/0317-Server-Tick-Events.patch rename to patches/server/0318-Server-Tick-Events.patch diff --git a/patches/server/0318-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0319-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0318-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0319-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0319-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0320-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0319-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0320-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0320-Add-Heightmap-API.patch b/patches/server/0321-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0320-Add-Heightmap-API.patch rename to patches/server/0321-Add-Heightmap-API.patch diff --git a/patches/server/0321-Mob-Spawner-API-Enhancements.patch b/patches/server/0322-Mob-Spawner-API-Enhancements.patch similarity index 95% rename from patches/server/0321-Mob-Spawner-API-Enhancements.patch rename to patches/server/0322-Mob-Spawner-API-Enhancements.patch index d24f3a6b4..c19c11852 100644 --- a/patches/server/0321-Mob-Spawner-API-Enhancements.patch +++ b/patches/server/0322-Mob-Spawner-API-Enhancements.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Mob Spawner API Enhancements diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index 3aadcb472ab808ee981065ddfa86be6cbf38c8d9..c6298b12e4e0c20be20e7e493be728f028f9eb31 100644 +index 9a8af1867315840518533381e594fc50542cd72d..68ce2732dfdc25ddadc15c43c30a609f9b1eba86 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -31,7 +31,7 @@ public abstract class BaseSpawner { @@ -26,7 +26,7 @@ index 3aadcb472ab808ee981065ddfa86be6cbf38c8d9..c6298b12e4e0c20be20e7e493be728f0 return world.isAffectsSpawningPlayerNearby((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange); // Paper } -@@ -204,7 +204,7 @@ public abstract class BaseSpawner { +@@ -225,7 +225,7 @@ public abstract class BaseSpawner { } } @@ -35,7 +35,7 @@ index 3aadcb472ab808ee981065ddfa86be6cbf38c8d9..c6298b12e4e0c20be20e7e493be728f0 if (this.maxSpawnDelay <= this.minSpawnDelay) { this.spawnDelay = this.minSpawnDelay; } else { -@@ -218,7 +218,13 @@ public abstract class BaseSpawner { +@@ -239,7 +239,13 @@ public abstract class BaseSpawner { } public void load(@Nullable Level world, BlockPos pos, CompoundTag nbt) { @@ -49,7 +49,7 @@ index 3aadcb472ab808ee981065ddfa86be6cbf38c8d9..c6298b12e4e0c20be20e7e493be728f0 List list = Lists.newArrayList(); if (nbt.contains("SpawnPotentials", 9)) { -@@ -237,10 +243,15 @@ public abstract class BaseSpawner { +@@ -258,10 +264,15 @@ public abstract class BaseSpawner { this.setSpawnData(world, pos, mobspawnerdata); }); } @@ -68,7 +68,7 @@ index 3aadcb472ab808ee981065ddfa86be6cbf38c8d9..c6298b12e4e0c20be20e7e493be728f0 this.spawnCount = nbt.getShort("SpawnCount"); } -@@ -262,9 +273,20 @@ public abstract class BaseSpawner { +@@ -283,9 +294,20 @@ public abstract class BaseSpawner { if (minecraftkey == null) { return nbt; } else { diff --git a/patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0323-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0323-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0323-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0323-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0324-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 100% rename from patches/server/0324-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to patches/server/0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch diff --git a/patches/server/0325-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0326-improve-CraftWorld-isChunkLoaded.patch similarity index 100% rename from patches/server/0325-improve-CraftWorld-isChunkLoaded.patch rename to patches/server/0326-improve-CraftWorld-isChunkLoaded.patch diff --git a/patches/server/0326-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/0326-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/0327-ChunkMapDistance-CME.patch b/patches/server/0328-ChunkMapDistance-CME.patch similarity index 100% rename from patches/server/0327-ChunkMapDistance-CME.patch rename to patches/server/0328-ChunkMapDistance-CME.patch diff --git a/patches/server/0328-Implement-CraftBlockSoundGroup.patch b/patches/server/0329-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0328-Implement-CraftBlockSoundGroup.patch rename to patches/server/0329-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0329-Chunk-debug-command.patch b/patches/server/0330-Chunk-debug-command.patch similarity index 100% rename from patches/server/0329-Chunk-debug-command.patch rename to patches/server/0330-Chunk-debug-command.patch diff --git a/patches/server/0330-Fix-World-isChunkGenerated-calls.patch b/patches/server/0331-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0330-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0331-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0331-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0332-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0331-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0332-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0332-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0333-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 96% rename from patches/server/0332-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0333-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index fbf0003ea..6ea6b8938 100644 --- a/patches/server/0332-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/patches/server/0333-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -37,7 +37,7 @@ index 090958a30ce20ff01ae77d4cd821a167474f0214..baf33659b021c89cbd02560cbfd9b0dd } + diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 30ba1e3cb75d994770b006b9dfd6669000a9c1a4..e20a645e28a2e503c02b2bd89424e95506a2e6df 100644 +index 6204bf41d410df9784b32f993b46d7adb2af5f13..19d0ed5ff8569b0280117750f9ce05095afd9f70 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -85,6 +85,13 @@ public final class NaturalSpawner { diff --git a/patches/server/0333-Configurable-projectile-relative-velocity.patch b/patches/server/0334-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0333-Configurable-projectile-relative-velocity.patch rename to patches/server/0334-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0334-offset-item-frame-ticking.patch b/patches/server/0335-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0334-offset-item-frame-ticking.patch rename to patches/server/0335-offset-item-frame-ticking.patch diff --git a/patches/server/0335-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/patches/server/0336-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch similarity index 100% rename from patches/server/0335-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch rename to patches/server/0336-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch diff --git a/patches/server/0336-Fix-MC-158900.patch b/patches/server/0337-Fix-MC-158900.patch similarity index 100% rename from patches/server/0336-Fix-MC-158900.patch rename to patches/server/0337-Fix-MC-158900.patch diff --git a/patches/server/0337-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0338-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0337-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0338-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0338-Generator-Settings.patch b/patches/server/0339-Generator-Settings.patch similarity index 100% rename from patches/server/0338-Generator-Settings.patch rename to patches/server/0339-Generator-Settings.patch diff --git a/patches/server/0339-Fix-MC-161754.patch b/patches/server/0340-Fix-MC-161754.patch similarity index 100% rename from patches/server/0339-Fix-MC-161754.patch rename to patches/server/0340-Fix-MC-161754.patch diff --git a/patches/server/0340-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/patches/server/0341-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch similarity index 100% rename from patches/server/0340-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch rename to patches/server/0341-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch diff --git a/patches/server/0341-Expose-the-internal-current-tick.patch b/patches/server/0342-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0341-Expose-the-internal-current-tick.patch rename to patches/server/0342-Expose-the-internal-current-tick.patch diff --git a/patches/server/0342-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/patches/server/0343-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch similarity index 100% rename from patches/server/0342-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch rename to patches/server/0343-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch diff --git a/patches/server/0343-Add-option-to-disable-pillager-patrols.patch b/patches/server/0344-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0343-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0344-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0344-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0345-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 100% rename from patches/server/0344-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to patches/server/0345-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch diff --git a/patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0346-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0346-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0347-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0347-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0347-Optimize-Hoppers.patch b/patches/server/0348-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0347-Optimize-Hoppers.patch rename to patches/server/0348-Optimize-Hoppers.patch diff --git a/patches/server/0348-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0348-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0349-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0349-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0350-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0350-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0351-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0351-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0352-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 100% rename from patches/server/0352-Optimise-IEntityAccess-getPlayerByUUID.patch rename to patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch diff --git a/patches/server/0353-Fix-items-not-falling-correctly.patch b/patches/server/0354-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0353-Fix-items-not-falling-correctly.patch rename to patches/server/0354-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0354-Lag-compensate-eating.patch b/patches/server/0355-Lag-compensate-eating.patch similarity index 100% rename from patches/server/0354-Lag-compensate-eating.patch rename to patches/server/0355-Lag-compensate-eating.patch diff --git a/patches/server/0355-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0355-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0356-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0356-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0357-Add-effect-to-block-break-naturally.patch b/patches/server/0358-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0357-Add-effect-to-block-break-naturally.patch rename to patches/server/0358-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0358-Entity-Activation-Range-2.0.patch b/patches/server/0359-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0358-Entity-Activation-Range-2.0.patch rename to patches/server/0359-Entity-Activation-Range-2.0.patch index 35cc61b42..426f54cef 100644 --- a/patches/server/0358-Entity-Activation-Range-2.0.patch +++ b/patches/server/0359-Entity-Activation-Range-2.0.patch @@ -293,7 +293,7 @@ index 065d0752db0e3ae2a89d707aaa2145807f50ecad..c93805ae832d049ea13ca495b778ed52 } } 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 6a9e2105b2d9a4ee83c0a2516d5ef26dc3b99053..a35ce224b11b44567814207c3821d0cd4cdd9ec1 100644 +index aec77679584a2acab5818e26e2586b5316118e84..9c7cb4f11c429ca5006cf5e178326ead1658581d 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -227,17 +227,29 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/patches/server/0359-Increase-Light-Queue-Size.patch b/patches/server/0360-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0359-Increase-Light-Queue-Size.patch rename to patches/server/0360-Increase-Light-Queue-Size.patch diff --git a/patches/server/0360-Fix-Light-Command.patch b/patches/server/0361-Fix-Light-Command.patch similarity index 100% rename from patches/server/0360-Fix-Light-Command.patch rename to patches/server/0361-Fix-Light-Command.patch diff --git a/patches/server/0361-No-Tick-view-distance-implementation.patch b/patches/server/0362-No-Tick-view-distance-implementation.patch similarity index 100% rename from patches/server/0361-No-Tick-view-distance-implementation.patch rename to patches/server/0362-No-Tick-view-distance-implementation.patch diff --git a/patches/server/0362-Implement-alternative-item-despawn-rate.patch b/patches/server/0363-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0362-Implement-alternative-item-despawn-rate.patch rename to patches/server/0363-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0363-Tracking-Range-Improvements.patch b/patches/server/0364-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0363-Tracking-Range-Improvements.patch rename to patches/server/0364-Tracking-Range-Improvements.patch diff --git a/patches/server/0364-Fix-items-vanishing-through-end-portal.patch b/patches/server/0365-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0364-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0365-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0365-implement-optional-per-player-mob-spawns.patch b/patches/server/0366-implement-optional-per-player-mob-spawns.patch similarity index 99% rename from patches/server/0365-implement-optional-per-player-mob-spawns.patch rename to patches/server/0366-implement-optional-per-player-mob-spawns.patch index 225d30ce9..5b3eeae28 100644 --- a/patches/server/0365-implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0366-implement-optional-per-player-mob-spawns.patch @@ -665,7 +665,7 @@ index bffc897cb88a54c36432c98264f3416051aeab17..14a0190ea5e9a387582736bb130c16a3 // Yes, this doesn't match Vanilla, but it's the best we can do for now. diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index e20a645e28a2e503c02b2bd89424e95506a2e6df..18a28659a72a761f53ca226bbf9866b4f30c2e4c 100644 +index 19d0ed5ff8569b0280117750f9ce05095afd9f70..490ff09c3c4f93dcafc1703b1df3fb2f7333add2 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -17,6 +17,7 @@ import net.minecraft.core.Registry; @@ -778,7 +778,7 @@ index e20a645e28a2e503c02b2bd89424e95506a2e6df..18a28659a72a761f53ca226bbf9866b4 int k = 0; while (k < 3) { -@@ -242,7 +283,7 @@ public final class NaturalSpawner { +@@ -248,7 +289,7 @@ public final class NaturalSpawner { Mob entityinsentient = NaturalSpawner.getMobForSpawn(world, biomesettingsmobs_c.type); if (entityinsentient == null) { @@ -787,7 +787,7 @@ index e20a645e28a2e503c02b2bd89424e95506a2e6df..18a28659a72a761f53ca226bbf9866b4 } entityinsentient.moveTo(d0, (double) i, d1, world.random.nextFloat() * 360.0F, 0.0F); -@@ -254,10 +295,15 @@ public final class NaturalSpawner { +@@ -260,10 +301,15 @@ public final class NaturalSpawner { ++j; ++k1; runner.run(entityinsentient, chunk); @@ -805,7 +805,7 @@ index e20a645e28a2e503c02b2bd89424e95506a2e6df..18a28659a72a761f53ca226bbf9866b4 } if (entityinsentient.isMaxGroupSizeReached(k1)) { -@@ -279,6 +325,7 @@ public final class NaturalSpawner { +@@ -285,6 +331,7 @@ public final class NaturalSpawner { } } diff --git a/patches/server/0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0368-Allow-overriding-the-java-version-check.patch b/patches/server/0369-Allow-overriding-the-java-version-check.patch similarity index 100% rename from patches/server/0368-Allow-overriding-the-java-version-check.patch rename to patches/server/0369-Allow-overriding-the-java-version-check.patch diff --git a/patches/server/0369-Add-ThrownEggHatchEvent.patch b/patches/server/0370-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0369-Add-ThrownEggHatchEvent.patch rename to patches/server/0370-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0370-Optimise-random-block-ticking.patch b/patches/server/0371-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0370-Optimise-random-block-ticking.patch rename to patches/server/0371-Optimise-random-block-ticking.patch diff --git a/patches/server/0371-Entity-Jump-API.patch b/patches/server/0372-Entity-Jump-API.patch similarity index 100% rename from patches/server/0371-Entity-Jump-API.patch rename to patches/server/0372-Entity-Jump-API.patch diff --git a/patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0373-Make-the-GUI-graph-fancier.patch b/patches/server/0374-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0373-Make-the-GUI-graph-fancier.patch rename to patches/server/0374-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0374-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0375-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0374-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0375-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0375-Prevent-teleporting-dead-entities.patch b/patches/server/0376-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0375-Prevent-teleporting-dead-entities.patch rename to patches/server/0376-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0376-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0377-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0376-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0377-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0378-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0378-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0379-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0379-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0379-Optimise-Chunk-getFluid.patch b/patches/server/0380-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0379-Optimise-Chunk-getFluid.patch rename to patches/server/0380-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0380-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0381-Optimise-TickListServer-by-rewriting-it.patch similarity index 100% rename from patches/server/0380-Optimise-TickListServer-by-rewriting-it.patch rename to patches/server/0381-Optimise-TickListServer-by-rewriting-it.patch diff --git a/patches/server/0381-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0382-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0381-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0382-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0382-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0383-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0382-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0383-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0383-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0384-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0383-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0384-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0384-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0385-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0384-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0385-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0386-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0385-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0386-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0386-Don-t-tick-dead-players.patch b/patches/server/0387-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0386-Don-t-tick-dead-players.patch rename to patches/server/0387-Don-t-tick-dead-players.patch diff --git a/patches/server/0387-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0388-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0387-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0388-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0388-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0389-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch similarity index 100% rename from patches/server/0388-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch rename to patches/server/0389-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch diff --git a/patches/server/0389-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0390-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch similarity index 100% rename from patches/server/0389-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch rename to patches/server/0390-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch diff --git a/patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0391-Add-tick-times-API-and-mspt-command.patch b/patches/server/0392-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0391-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0392-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0392-Expose-MinecraftServer-isRunning.patch b/patches/server/0393-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0392-Expose-MinecraftServer-isRunning.patch rename to patches/server/0393-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0393-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0394-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0393-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0394-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0394-Remove-streams-from-Mob-AI-System.patch b/patches/server/0395-Remove-streams-from-Mob-AI-System.patch similarity index 100% rename from patches/server/0394-Remove-streams-from-Mob-AI-System.patch rename to patches/server/0395-Remove-streams-from-Mob-AI-System.patch diff --git a/patches/server/0395-Async-command-map-building.patch b/patches/server/0396-Async-command-map-building.patch similarity index 100% rename from patches/server/0395-Async-command-map-building.patch rename to patches/server/0396-Async-command-map-building.patch diff --git a/patches/server/0396-Improved-Watchdog-Support.patch b/patches/server/0397-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0396-Improved-Watchdog-Support.patch rename to patches/server/0397-Improved-Watchdog-Support.patch diff --git a/patches/server/0397-Optimize-Pathfinding.patch b/patches/server/0398-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0397-Optimize-Pathfinding.patch rename to patches/server/0398-Optimize-Pathfinding.patch diff --git a/patches/server/0398-Reduce-Either-Optional-allocation.patch b/patches/server/0399-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0398-Reduce-Either-Optional-allocation.patch rename to patches/server/0399-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0399-Remove-streams-from-PairedQueue.patch b/patches/server/0400-Remove-streams-from-PairedQueue.patch similarity index 100% rename from patches/server/0399-Remove-streams-from-PairedQueue.patch rename to patches/server/0400-Remove-streams-from-PairedQueue.patch diff --git a/patches/server/0400-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0401-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0400-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0401-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0401-Prevent-opening-inventories-when-frozen.patch b/patches/server/0402-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0401-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0402-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0402-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0403-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from patches/server/0402-Optimise-ArraySetSorted-removeIf.patch rename to patches/server/0403-Optimise-ArraySetSorted-removeIf.patch diff --git a/patches/server/0403-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0404-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0403-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0404-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0404-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0405-Restrict-vanilla-teleport-command-to-valid-locations.patch similarity index 100% rename from patches/server/0404-Restrict-vanilla-teleport-command-to-valid-locations.patch rename to patches/server/0405-Restrict-vanilla-teleport-command-to-valid-locations.patch diff --git a/patches/server/0405-Implement-Player-Client-Options-API.patch b/patches/server/0406-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0405-Implement-Player-Client-Options-API.patch rename to patches/server/0406-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0406-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0407-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from patches/server/0406-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to patches/server/0407-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/patches/server/0407-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0408-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0407-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0408-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0408-Broadcast-join-message-to-console.patch b/patches/server/0409-Broadcast-join-message-to-console.patch similarity index 100% rename from patches/server/0408-Broadcast-join-message-to-console.patch rename to patches/server/0409-Broadcast-join-message-to-console.patch diff --git a/patches/server/0409-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0410-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0409-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0410-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0410-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0411-Load-Chunks-for-Login-Asynchronously.patch similarity index 100% rename from patches/server/0410-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0411-Load-Chunks-for-Login-Asynchronously.patch diff --git a/patches/server/0411-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0412-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0411-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0412-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0412-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0413-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0412-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0413-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0413-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0414-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch similarity index 100% rename from patches/server/0413-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch rename to patches/server/0414-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch diff --git a/patches/server/0414-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0415-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0414-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0415-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0415-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0416-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0415-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0416-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0416-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0417-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0416-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0417-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0417-Implement-Brigadier-Mojang-API.patch b/patches/server/0418-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0417-Implement-Brigadier-Mojang-API.patch rename to patches/server/0418-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0418-Villager-Restocks-API.patch b/patches/server/0419-Villager-Restocks-API.patch similarity index 97% rename from patches/server/0418-Villager-Restocks-API.patch rename to patches/server/0419-Villager-Restocks-API.patch index 3f24c8fdf..1445794bf 100644 --- a/patches/server/0418-Villager-Restocks-API.patch +++ b/patches/server/0419-Villager-Restocks-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Villager Restocks API 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 a35ce224b11b44567814207c3821d0cd4cdd9ec1..e99cdbb1d050288b5f1177737b242c331a989471 100644 +index 9c7cb4f11c429ca5006cf5e178326ead1658581d..fd2a2493fd7c935ab0b2fcd0f5d2b87ef3413af2 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -127,7 +127,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/patches/server/0419-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0420-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0419-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0420-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0420-Expose-game-version.patch b/patches/server/0421-Expose-game-version.patch similarity index 100% rename from patches/server/0420-Expose-game-version.patch rename to patches/server/0421-Expose-game-version.patch diff --git a/patches/server/0421-Optimize-Voxel-Shape-Merging.patch b/patches/server/0422-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0421-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0422-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0422-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0423-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0422-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0423-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0423-Implement-Mob-Goal-API.patch b/patches/server/0424-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0423-Implement-Mob-Goal-API.patch rename to patches/server/0424-Implement-Mob-Goal-API.patch diff --git a/patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/0425-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0426-Optimize-isOutsideRange-to-use-distance-maps.patch similarity index 100% rename from patches/server/0425-Optimize-isOutsideRange-to-use-distance-maps.patch rename to patches/server/0426-Optimize-isOutsideRange-to-use-distance-maps.patch diff --git a/patches/server/0426-Add-villager-reputation-API.patch b/patches/server/0427-Add-villager-reputation-API.patch similarity index 98% rename from patches/server/0426-Add-villager-reputation-API.patch rename to patches/server/0427-Add-villager-reputation-API.patch index 3679ce049..851d9cc05 100644 --- a/patches/server/0426-Add-villager-reputation-API.patch +++ b/patches/server/0427-Add-villager-reputation-API.patch @@ -71,10 +71,10 @@ index 07ecb01d02f64e85d478995062a33b58c211ed7e..e316f83a7adc7bba06a6a3fdab55cc9c static class GossipEntry { 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 e99cdbb1d050288b5f1177737b242c331a989471..8508a3864fc3f8919f823d96f27061a6b3706713 100644 +index fd2a2493fd7c935ab0b2fcd0f5d2b87ef3413af2..94e742856244b99236ba458fa38801abb5acf286 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -1065,6 +1065,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -1080,6 +1080,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler this.numberOfRestocksToday = 0; } diff --git a/patches/server/0426-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0428-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0426-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0428-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0427-ExperienceOrbMergeEvent.patch b/patches/server/0429-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0427-ExperienceOrbMergeEvent.patch rename to patches/server/0429-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0427-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0430-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0427-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0430-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0428-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0431-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0428-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0431-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0429-Potential-bed-API.patch b/patches/server/0432-Potential-bed-API.patch similarity index 100% rename from patches/server/0429-Potential-bed-API.patch rename to patches/server/0432-Potential-bed-API.patch diff --git a/patches/server/0430-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0433-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0430-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0433-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0431-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0434-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0431-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0434-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0432-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0435-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0432-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0435-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0433-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0436-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0433-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/server/0436-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0434-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0437-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0434-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0437-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0435-Ensure-safe-gateway-teleport.patch b/patches/server/0438-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0435-Ensure-safe-gateway-teleport.patch rename to patches/server/0438-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0436-Add-option-for-console-having-all-permissions.patch b/patches/server/0439-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0436-Add-option-for-console-having-all-permissions.patch rename to patches/server/0439-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0437-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0440-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch similarity index 100% rename from patches/server/0437-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch rename to patches/server/0440-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch