From 76879ba957ed07241049adcefb46b9e879341709 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 23 Nov 2021 16:43:50 -0800 Subject: [PATCH] Fix issues with IntIdentityHashBiMiap --- .../1.18}/0228-Optimize-IntIdentityHashBiMiap-nextId.patch | 3 +++ ...Option-to-prevent-armor-stands-from-doing-entity-loo.patch} | 0 ...hts.patch => 0229-Vanished-players-don-t-have-rights.patch} | 0 ...g.patch => 0230-Allow-disabling-armour-stand-ticking.patch} | 0 ...orse-Additions.patch => 0231-SkeletonHorse-Additions.patch} | 0 ....patch => 0232-Don-t-call-getItemMeta-on-hasItemMeta.patch} | 0 ...-API.patch => 0233-Implement-Expanded-ArmorStand-API.patch} | 0 ...0235-AnvilDamageEvent.patch => 0234-AnvilDamageEvent.patch} | 0 ...ucket-events.patch => 0235-Add-hand-to-bucket-events.patch} | 0 ...37-Add-TNTPrimeEvent.patch => 0236-Add-TNTPrimeEvent.patch} | 0 ... 0237-Break-up-and-make-tab-spam-limits-configurable.patch} | 0 ...=> 0238-MC-135506-Experience-should-save-as-Integers.patch} | 0 ...h => 0239-Fix-client-rendering-skulls-from-same-user.patch} | 0 ...-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} | 2 +- ....patch => 0241-Add-Early-Warning-Feature-to-WatchDog.patch} | 0 ...ent-Mob.patch => 0242-Make-EnderDragon-implement-Mob.patch} | 0 ...List.patch => 0243-Use-ConcurrentHashMap-in-JsonList.patch} | 0 ...ands.patch => 0244-Use-a-Queue-for-Queueing-Commands.patch} | 0 ...Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} | 0 ....patch => 0246-Optimize-BlockPosition-helper-methods.patch} | 0 ...Restore-vanlla-default-mob-spawn-range-and-water-ani.patch} | 0 ...hfinder-Events.patch => 0248-Slime-Pathfinder-Events.patch} | 0 ... 0249-Configurable-speed-for-water-flowing-over-lava.patch} | 0 ...ation.patch => 0250-Optimize-CraftBlockData-Creation.patch} | 0 ...MappedRegistry.patch => 0251-Optimize-MappedRegistry.patch} | 0 ...PreSpawnEvent.patch => 0252-Add-PhantomPreSpawnEvent.patch} | 0 ...-More-Creeper-API.patch => 0253-Add-More-Creeper-API.patch} | 0 ...temAnySlot.patch => 0254-Inventory-removeItemAnySlot.patch} | 0 ...Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} | 0 ...ding.patch => 0256-Asynchronous-chunk-IO-and-loading.patch} | 0 ...atch => 0257-Add-ray-tracing-methods-to-LivingEntity.patch} | 0 ...ch => 0258-Expose-attack-cooldown-methods-for-Player.patch} | 0 ...rove-death-events.patch => 0259-Improve-death-events.patch} | 0 ...atch => 0260-Allow-chests-to-be-placed-with-NBT-data.patch} | 0 ...ob-Pathfinding-API.patch => 0261-Mob-Pathfinding-API.patch} | 0 ...Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} | 0 ...tch => 0263-Prevent-chunk-loading-from-Fluid-Flowing.patch} | 0 ...tch => 0264-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} | 0 ...-Prevent-mob-spawning-from-loading-generating-chunks.patch} | 0 ... => 0266-Implement-furnace-cook-speed-multiplier-API.patch} | 0 ...0267-Catch-JsonParseException-in-Entity-and-TE-names.patch} | 0 ...le.ageLock.patch => 0268-Honor-EntityAgeable.ageLock.patch} | 0 ...> 0269-Configurable-connection-throttle-kick-message.patch} | 0 ...-rewrites.patch => 0270-Hook-into-CB-plugin-rewrites.patch} | 0 ...SpawnerSpawnEvent.patch => 0271-PreSpawnerSpawnEvent.patch} | 0 ...ntity.patch => 0272-Add-LivingEntity-getTargetEntity.patch} | 0 ...dd-sun-related-API.patch => 0273-Add-sun-related-API.patch} | 0 .../{0275-Here-s-Johnny.patch => 0274-Here-s-Johnny.patch} | 0 .../server/{0276-Turtle-API.patch => 0275-Turtle-API.patch} | 0 ...Call-player-spectator-target-events-and-improve-impl.patch} | 0 ...MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} | 0 ...ort.patch => 0278-Add-Velocity-IP-Forwarding-Support.patch} | 0 ...-Add-more-Witch-API.patch => 0279-Add-more-Witch-API.patch} | 0 ...=> 0280-Check-Drowned-for-Villager-Aggression-Config.patch} | 0 ...Add-option-to-prevent-players-from-moving-into-unloa.patch} | 0 ...pawn.patch => 0282-Reset-players-airTicks-on-respawn.patch} | 0 ...0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch} | 0 ...284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} | 0 ...me-Updates.patch => 0285-Optimize-World-Time-Updates.patch} | 0 ...patch => 0286-Restore-custom-InventoryHolder-support.patch} | 0 ...art-Speeds.patch => 0287-Use-Vanilla-Minecart-Speeds.patch} | 0 ...andling.patch => 0288-Fix-SpongeAbsortEvent-handling.patch} | 0 ...tch => 0289-Don-t-allow-digging-into-unloaded-chunks.patch} | 0 ...290-Make-the-default-permission-message-configurable.patch} | 0 ...s.patch => 0291-Prevent-rayTrace-from-loading-chunks.patch} | 0 ...ch => 0292-Handle-Large-Packets-disconnecting-client.patch} | 0 66 files changed, 4 insertions(+), 1 deletion(-) rename patches/{server => removed/1.18}/0228-Optimize-IntIdentityHashBiMiap-nextId.patch (95%) rename patches/server/{0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0228-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (100%) rename patches/server/{0230-Vanished-players-don-t-have-rights.patch => 0229-Vanished-players-don-t-have-rights.patch} (100%) rename patches/server/{0231-Allow-disabling-armour-stand-ticking.patch => 0230-Allow-disabling-armour-stand-ticking.patch} (100%) rename patches/server/{0232-SkeletonHorse-Additions.patch => 0231-SkeletonHorse-Additions.patch} (100%) rename patches/server/{0233-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0232-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%) rename patches/server/{0234-Implement-Expanded-ArmorStand-API.patch => 0233-Implement-Expanded-ArmorStand-API.patch} (100%) rename patches/server/{0235-AnvilDamageEvent.patch => 0234-AnvilDamageEvent.patch} (100%) rename patches/server/{0236-Add-hand-to-bucket-events.patch => 0235-Add-hand-to-bucket-events.patch} (100%) rename patches/server/{0237-Add-TNTPrimeEvent.patch => 0236-Add-TNTPrimeEvent.patch} (100%) rename patches/server/{0238-Break-up-and-make-tab-spam-limits-configurable.patch => 0237-Break-up-and-make-tab-spam-limits-configurable.patch} (100%) rename patches/server/{0239-MC-135506-Experience-should-save-as-Integers.patch => 0238-MC-135506-Experience-should-save-as-Integers.patch} (100%) rename patches/server/{0240-Fix-client-rendering-skulls-from-same-user.patch => 0239-Fix-client-rendering-skulls-from-same-user.patch} (100%) rename patches/server/{0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0240-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (98%) rename patches/server/{0242-Add-Early-Warning-Feature-to-WatchDog.patch => 0241-Add-Early-Warning-Feature-to-WatchDog.patch} (100%) rename patches/server/{0243-Make-EnderDragon-implement-Mob.patch => 0242-Make-EnderDragon-implement-Mob.patch} (100%) rename patches/server/{0244-Use-ConcurrentHashMap-in-JsonList.patch => 0243-Use-ConcurrentHashMap-in-JsonList.patch} (100%) rename patches/server/{0245-Use-a-Queue-for-Queueing-Commands.patch => 0244-Use-a-Queue-for-Queueing-Commands.patch} (100%) rename patches/server/{0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0245-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%) rename patches/server/{0247-Optimize-BlockPosition-helper-methods.patch => 0246-Optimize-BlockPosition-helper-methods.patch} (100%) rename patches/server/{0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch => 0247-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch} (100%) rename patches/server/{0249-Slime-Pathfinder-Events.patch => 0248-Slime-Pathfinder-Events.patch} (100%) rename patches/server/{0250-Configurable-speed-for-water-flowing-over-lava.patch => 0249-Configurable-speed-for-water-flowing-over-lava.patch} (100%) rename patches/server/{0251-Optimize-CraftBlockData-Creation.patch => 0250-Optimize-CraftBlockData-Creation.patch} (100%) rename patches/server/{0252-Optimize-MappedRegistry.patch => 0251-Optimize-MappedRegistry.patch} (100%) rename patches/server/{0253-Add-PhantomPreSpawnEvent.patch => 0252-Add-PhantomPreSpawnEvent.patch} (100%) rename patches/server/{0254-Add-More-Creeper-API.patch => 0253-Add-More-Creeper-API.patch} (100%) rename patches/server/{0255-Inventory-removeItemAnySlot.patch => 0254-Inventory-removeItemAnySlot.patch} (100%) rename patches/server/{0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0255-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%) rename patches/server/{0257-Asynchronous-chunk-IO-and-loading.patch => 0256-Asynchronous-chunk-IO-and-loading.patch} (100%) rename patches/server/{0258-Add-ray-tracing-methods-to-LivingEntity.patch => 0257-Add-ray-tracing-methods-to-LivingEntity.patch} (100%) rename patches/server/{0259-Expose-attack-cooldown-methods-for-Player.patch => 0258-Expose-attack-cooldown-methods-for-Player.patch} (100%) rename patches/server/{0260-Improve-death-events.patch => 0259-Improve-death-events.patch} (100%) rename patches/server/{0261-Allow-chests-to-be-placed-with-NBT-data.patch => 0260-Allow-chests-to-be-placed-with-NBT-data.patch} (100%) rename patches/server/{0262-Mob-Pathfinding-API.patch => 0261-Mob-Pathfinding-API.patch} (100%) rename patches/server/{0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0262-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%) rename patches/server/{0264-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0263-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%) rename patches/server/{0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0264-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%) rename patches/server/{0266-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0265-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%) rename patches/server/{0267-Implement-furnace-cook-speed-multiplier-API.patch => 0266-Implement-furnace-cook-speed-multiplier-API.patch} (100%) rename patches/server/{0268-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0267-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%) rename patches/server/{0269-Honor-EntityAgeable.ageLock.patch => 0268-Honor-EntityAgeable.ageLock.patch} (100%) rename patches/server/{0270-Configurable-connection-throttle-kick-message.patch => 0269-Configurable-connection-throttle-kick-message.patch} (100%) rename patches/server/{0271-Hook-into-CB-plugin-rewrites.patch => 0270-Hook-into-CB-plugin-rewrites.patch} (100%) rename patches/server/{0272-PreSpawnerSpawnEvent.patch => 0271-PreSpawnerSpawnEvent.patch} (100%) rename patches/server/{0273-Add-LivingEntity-getTargetEntity.patch => 0272-Add-LivingEntity-getTargetEntity.patch} (100%) rename patches/server/{0274-Add-sun-related-API.patch => 0273-Add-sun-related-API.patch} (100%) rename patches/server/{0275-Here-s-Johnny.patch => 0274-Here-s-Johnny.patch} (100%) rename patches/server/{0276-Turtle-API.patch => 0275-Turtle-API.patch} (100%) rename patches/server/{0277-Call-player-spectator-target-events-and-improve-impl.patch => 0276-Call-player-spectator-target-events-and-improve-impl.patch} (100%) rename patches/server/{0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%) rename patches/server/{0279-Add-Velocity-IP-Forwarding-Support.patch => 0278-Add-Velocity-IP-Forwarding-Support.patch} (100%) rename patches/server/{0280-Add-more-Witch-API.patch => 0279-Add-more-Witch-API.patch} (100%) rename patches/server/{0281-Check-Drowned-for-Villager-Aggression-Config.patch => 0280-Check-Drowned-for-Villager-Aggression-Config.patch} (100%) rename patches/server/{0282-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0281-Add-option-to-prevent-players-from-moving-into-unloa.patch} (100%) rename patches/server/{0283-Reset-players-airTicks-on-respawn.patch => 0282-Reset-players-airTicks-on-respawn.patch} (100%) rename patches/server/{0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%) rename patches/server/{0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%) rename patches/server/{0286-Optimize-World-Time-Updates.patch => 0285-Optimize-World-Time-Updates.patch} (100%) rename patches/server/{0287-Restore-custom-InventoryHolder-support.patch => 0286-Restore-custom-InventoryHolder-support.patch} (100%) rename patches/server/{0288-Use-Vanilla-Minecart-Speeds.patch => 0287-Use-Vanilla-Minecart-Speeds.patch} (100%) rename patches/server/{0289-Fix-SpongeAbsortEvent-handling.patch => 0288-Fix-SpongeAbsortEvent-handling.patch} (100%) rename patches/server/{0290-Don-t-allow-digging-into-unloaded-chunks.patch => 0289-Don-t-allow-digging-into-unloaded-chunks.patch} (100%) rename patches/server/{0291-Make-the-default-permission-message-configurable.patch => 0290-Make-the-default-permission-message-configurable.patch} (100%) rename patches/server/{0292-Prevent-rayTrace-from-loading-chunks.patch => 0291-Prevent-rayTrace-from-loading-chunks.patch} (100%) rename patches/server/{0293-Handle-Large-Packets-disconnecting-client.patch => 0292-Handle-Large-Packets-disconnecting-client.patch} (100%) diff --git a/patches/server/0228-Optimize-IntIdentityHashBiMiap-nextId.patch b/patches/removed/1.18/0228-Optimize-IntIdentityHashBiMiap-nextId.patch similarity index 95% rename from patches/server/0228-Optimize-IntIdentityHashBiMiap-nextId.patch rename to patches/removed/1.18/0228-Optimize-IntIdentityHashBiMiap-nextId.patch index df3c55eec..ae4e49590 100644 --- a/patches/server/0228-Optimize-IntIdentityHashBiMiap-nextId.patch +++ b/patches/removed/1.18/0228-Optimize-IntIdentityHashBiMiap-nextId.patch @@ -7,6 +7,9 @@ Optimizes CrudeIncrementalIntIdentityHashBiMap#nextId() This is a frequent hotspot for world loading/saving. +1.18 todo: seems like the bitset is too small now? removing this patch fixed +lots of issues related to synchedentitydata and structure gen + diff --git a/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java b/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java index dc7528b41aa9a55807a2b3e33d5668e1be681e79..a002218caed08bf4a4072d934e1094c22ee35534 100644 --- a/src/main/java/net/minecraft/util/CrudeIncrementalIntIdentityHashBiMap.java diff --git a/patches/server/0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0228-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0228-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0230-Vanished-players-don-t-have-rights.patch b/patches/server/0229-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0230-Vanished-players-don-t-have-rights.patch rename to patches/server/0229-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0231-Allow-disabling-armour-stand-ticking.patch b/patches/server/0230-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0231-Allow-disabling-armour-stand-ticking.patch rename to patches/server/0230-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0232-SkeletonHorse-Additions.patch b/patches/server/0231-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0232-SkeletonHorse-Additions.patch rename to patches/server/0231-SkeletonHorse-Additions.patch diff --git a/patches/server/0233-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0232-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0233-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/server/0232-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0234-Implement-Expanded-ArmorStand-API.patch b/patches/server/0233-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0234-Implement-Expanded-ArmorStand-API.patch rename to patches/server/0233-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0235-AnvilDamageEvent.patch b/patches/server/0234-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0235-AnvilDamageEvent.patch rename to patches/server/0234-AnvilDamageEvent.patch diff --git a/patches/server/0236-Add-hand-to-bucket-events.patch b/patches/server/0235-Add-hand-to-bucket-events.patch similarity index 100% rename from patches/server/0236-Add-hand-to-bucket-events.patch rename to patches/server/0235-Add-hand-to-bucket-events.patch diff --git a/patches/server/0237-Add-TNTPrimeEvent.patch b/patches/server/0236-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0237-Add-TNTPrimeEvent.patch rename to patches/server/0236-Add-TNTPrimeEvent.patch diff --git a/patches/server/0238-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0237-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0238-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0237-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0239-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0238-MC-135506-Experience-should-save-as-Integers.patch similarity index 100% rename from patches/server/0239-MC-135506-Experience-should-save-as-Integers.patch rename to patches/server/0238-MC-135506-Experience-should-save-as-Integers.patch diff --git a/patches/server/0240-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0239-Fix-client-rendering-skulls-from-same-user.patch similarity index 100% rename from patches/server/0240-Fix-client-rendering-skulls-from-same-user.patch rename to patches/server/0239-Fix-client-rendering-skulls-from-same-user.patch diff --git a/patches/server/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0240-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 98% rename from patches/server/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0240-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index fd6870d0e..18b1f74bb 100644 --- a/patches/server/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0240-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -8,7 +8,7 @@ Add -Ddebug.entities=true to your JVM flags to gain more information 1.17: Needs to be reworked for new entity storage system diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 1a62a21d40c583f9cbf2b8fbb63b691fffb71ae0..6af70073e1ee0290ec30392153c2c18dfeffa0e8 100644 +index a268ea70d084465bf2ba0550083a136540d88734..0727c025e87e889861b2f3e78e28d4d17840ff54 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1319,6 +1319,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0242-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0241-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/0241-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/0243-Make-EnderDragon-implement-Mob.patch b/patches/server/0242-Make-EnderDragon-implement-Mob.patch similarity index 100% rename from patches/server/0243-Make-EnderDragon-implement-Mob.patch rename to patches/server/0242-Make-EnderDragon-implement-Mob.patch diff --git a/patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0243-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/0243-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0245-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0244-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/0244-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/0245-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/0245-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/0246-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0247-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0246-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/server/0247-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/0247-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch diff --git a/patches/server/0249-Slime-Pathfinder-Events.patch b/patches/server/0248-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0249-Slime-Pathfinder-Events.patch rename to patches/server/0248-Slime-Pathfinder-Events.patch diff --git a/patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0249-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/0249-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0251-Optimize-CraftBlockData-Creation.patch b/patches/server/0250-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0251-Optimize-CraftBlockData-Creation.patch rename to patches/server/0250-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0252-Optimize-MappedRegistry.patch b/patches/server/0251-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0252-Optimize-MappedRegistry.patch rename to patches/server/0251-Optimize-MappedRegistry.patch diff --git a/patches/server/0253-Add-PhantomPreSpawnEvent.patch b/patches/server/0252-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0253-Add-PhantomPreSpawnEvent.patch rename to patches/server/0252-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0254-Add-More-Creeper-API.patch b/patches/server/0253-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0254-Add-More-Creeper-API.patch rename to patches/server/0253-Add-More-Creeper-API.patch diff --git a/patches/server/0255-Inventory-removeItemAnySlot.patch b/patches/server/0254-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0255-Inventory-removeItemAnySlot.patch rename to patches/server/0254-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0255-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/0255-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0257-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0256-Asynchronous-chunk-IO-and-loading.patch similarity index 100% rename from patches/server/0257-Asynchronous-chunk-IO-and-loading.patch rename to patches/server/0256-Asynchronous-chunk-IO-and-loading.patch diff --git a/patches/server/0258-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0257-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/0257-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0259-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0258-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/0258-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0260-Improve-death-events.patch b/patches/server/0259-Improve-death-events.patch similarity index 100% rename from patches/server/0260-Improve-death-events.patch rename to patches/server/0259-Improve-death-events.patch diff --git a/patches/server/0261-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0260-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/0260-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0262-Mob-Pathfinding-API.patch b/patches/server/0261-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0262-Mob-Pathfinding-API.patch rename to patches/server/0261-Mob-Pathfinding-API.patch diff --git a/patches/server/0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0262-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/server/0262-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0263-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0263-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0264-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/0264-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/0265-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0265-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0267-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0266-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/0266-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0268-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0267-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/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0269-Honor-EntityAgeable.ageLock.patch b/patches/server/0268-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0269-Honor-EntityAgeable.ageLock.patch rename to patches/server/0268-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0270-Configurable-connection-throttle-kick-message.patch b/patches/server/0269-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0270-Configurable-connection-throttle-kick-message.patch rename to patches/server/0269-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0271-Hook-into-CB-plugin-rewrites.patch b/patches/server/0270-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0271-Hook-into-CB-plugin-rewrites.patch rename to patches/server/0270-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0272-PreSpawnerSpawnEvent.patch b/patches/server/0271-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0272-PreSpawnerSpawnEvent.patch rename to patches/server/0271-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0273-Add-LivingEntity-getTargetEntity.patch b/patches/server/0272-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0273-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0272-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0274-Add-sun-related-API.patch b/patches/server/0273-Add-sun-related-API.patch similarity index 100% rename from patches/server/0274-Add-sun-related-API.patch rename to patches/server/0273-Add-sun-related-API.patch diff --git a/patches/server/0275-Here-s-Johnny.patch b/patches/server/0274-Here-s-Johnny.patch similarity index 100% rename from patches/server/0275-Here-s-Johnny.patch rename to patches/server/0274-Here-s-Johnny.patch diff --git a/patches/server/0276-Turtle-API.patch b/patches/server/0275-Turtle-API.patch similarity index 100% rename from patches/server/0276-Turtle-API.patch rename to patches/server/0275-Turtle-API.patch diff --git a/patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0280-Add-more-Witch-API.patch b/patches/server/0279-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0280-Add-more-Witch-API.patch rename to patches/server/0279-Add-more-Witch-API.patch diff --git a/patches/server/0281-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/0281-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0283-Reset-players-airTicks-on-respawn.patch b/patches/server/0282-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0283-Reset-players-airTicks-on-respawn.patch rename to patches/server/0282-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0286-Optimize-World-Time-Updates.patch b/patches/server/0285-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0286-Optimize-World-Time-Updates.patch rename to patches/server/0285-Optimize-World-Time-Updates.patch diff --git a/patches/server/0287-Restore-custom-InventoryHolder-support.patch b/patches/server/0286-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0287-Restore-custom-InventoryHolder-support.patch rename to patches/server/0286-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0288-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0287-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0288-Use-Vanilla-Minecart-Speeds.patch rename to patches/server/0287-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0289-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0288-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0289-Fix-SpongeAbsortEvent-handling.patch rename to patches/server/0288-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/0291-Make-the-default-permission-message-configurable.patch b/patches/server/0290-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0291-Make-the-default-permission-message-configurable.patch rename to patches/server/0290-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0293-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0292-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0293-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0292-Handle-Large-Packets-disconnecting-client.patch