Remove old redundant fix (#8530)

PaperMC · Nov 3, 2022 · ab1c072 · ab1c072
1 parent ebc0f6b
commit ab1c072
Show file tree

Hide file tree

Showing 634 changed files with 250 additions and 269 deletions.
diff --git a/...ggleEvent-when-whitelist-is-toggled.patch → ...ggleEvent-when-whitelist-is-toggled.patch b/...ggleEvent-when-whitelist-is-toggled.patch → ...ggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 97f045ee1af5479b2befe2e03f082933cfe91007..45cd4ac70bf322a3bb256579f795db46b9beb7a0 100644
+index 4da6c770ff4953b81c4694c665d453ca7d3e532b..8b586272b0f05a12607aa138596ecd5f1e86d0b7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1129,6 +1129,7 @@ public abstract class PlayerList {

diff --git a/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/...er/0305-Entity-getEntitySpawnReason.patch → ...er/0304-Entity-getEntitySpawnReason.patch b/...er/0305-Entity-getEntitySpawnReason.patch → ...er/0304-Entity-getEntitySpawnReason.patch
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index efc2db1b27e9ac4b1094b7e529c198a94d05b164..84eeb8787c389a3c66b23d567f6c2ebe9644a1ce 100644
+index 57dbe97d4d4f98811616d12570bf2fc2ba91a3a0..0ba8f25d7f54ec2ed9e15a3cf7016464741c0de0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1250,6 +1250,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -22,7 +22,7 @@ index efc2db1b27e9ac4b1094b7e529c198a94d05b164..84eeb8787c389a3c66b23d567f6c2ebe
              // Paper start
              if (DEBUG_ENTITIES) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 45cd4ac70bf322a3bb256579f795db46b9beb7a0..80b6eb1e010559c02c9e7624a5c131d11c80c68e 100644
+index 8b586272b0f05a12607aa138596ecd5f1e86d0b7..fe359cfdc42a86e26a890252ba994ca1fe7726ea 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -348,7 +348,7 @@ public abstract class PlayerList {
@@ -93,7 +93,7 @@ index fb67f1d76d683694db13b29bab1d69606b414950..d83fc656e70612bbfa93f5ef2cc11611
 
          } 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 0be0c7a323277093a6f8e476048eb9ee8712cbc9..c7e97263eee005fd673882e11c436542cb0ca62a 100644
+index 92e3bb8b59d79cbe79fa55a7db443bd7a1957914..c24c6fb1badf7d2764ef6cd76c0368297af84afc 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -181,6 +181,7 @@ public abstract class BaseSpawner {

diff --git a/...ty-Metadata-for-all-tracked-players.patch → ...ty-Metadata-for-all-tracked-players.patch b/...ty-Metadata-for-all-tracked-players.patch → ...ty-Metadata-for-all-tracked-players.patch
diff --git a/...server/0307-Fire-event-on-GS4-query.patch → ...server/0306-Fire-event-on-GS4-query.patch b/...server/0307-Fire-event-on-GS4-query.patch → ...server/0306-Fire-event-on-GS4-query.patch
diff --git a/...08-Implement-PlayerPostRespawnEvent.patch → ...07-Implement-PlayerPostRespawnEvent.patch b/...08-Implement-PlayerPostRespawnEvent.patch → ...07-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 80b6eb1e010559c02c9e7624a5c131d11c80c68e..d8c936b6b242d6ad2ca63ab98a4a111fed402241 100644
+index fe359cfdc42a86e26a890252ba994ca1fe7726ea..f77bbe5ebd3fd93ec6cf92a049b585178c7583d8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -728,9 +728,14 @@ public abstract class PlayerList {

diff --git a/...for-pickupDelay-breaks-picking-up-i.patch → ...for-pickupDelay-breaks-picking-up-i.patch b/...for-pickupDelay-breaks-picking-up-i.patch → ...for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0310-Server-Tick-Events.patch → patches/server/0309-Server-Tick-Events.patch b/patches/server/0310-Server-Tick-Events.patch → patches/server/0309-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index acc9f22a1284cea2e29f3616598f8388f0a0e6f6..f9a96a11764b66709a0d74122f9ecc06d0365a93 100644
+index ddd7f78314275e054a1437b633458d8564ef28ca..412380f4bfe8a2d50090904124242e8b2c7bfa1b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1302,6 +1302,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

diff --git a/...311-PlayerDeathEvent-getItemsToKeep.patch → ...310-PlayerDeathEvent-getItemsToKeep.patch b/...311-PlayerDeathEvent-getItemsToKeep.patch → ...310-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/...Optimize-Captured-TileEntity-Lookup.patch → ...Optimize-Captured-TileEntity-Lookup.patch b/...Optimize-Captured-TileEntity-Lookup.patch → ...Optimize-Captured-TileEntity-Lookup.patch
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1a474fb88dc1447fb754e8ad936ab6add470359c..cb7e92f2694cefeecebc840959a01e1e1945061a 100644
+index 699df824d2e9fe8b6f6a1ccc8ae7c818c84204cb..7ba3e9a2f974cd469d256dbfbdbfcb05b644c1ba 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -845,9 +845,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

diff --git a/patches/server/0313-Add-Heightmap-API.patch → patches/server/0312-Add-Heightmap-API.patch b/patches/server/0313-Add-Heightmap-API.patch → patches/server/0312-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0ca653a0b0059116eaa943207bf04b5bfbe77e8f..8a8993ff7ec450416ef16941079ee0ac3078767b 100644
+index ec3ea01033e2c6f2904d4f0a4b0e08bd12b713f7..ce61a2b5b3dfb15e8aeb6816f6c6b1b9e3a9d725 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -222,6 +222,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {

diff --git a/...r/0314-Mob-Spawner-API-Enhancements.patch → ...r/0313-Mob-Spawner-API-Enhancements.patch b/...r/0314-Mob-Spawner-API-Enhancements.patch → ...r/0313-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 c7e97263eee005fd673882e11c436542cb0ca62a..e3d8814cbad30da795632afddf8ebc87eff72106 100644
+index c24c6fb1badf7d2764ef6cd76c0368297af84afc..763b4049060b294345ef8a796c0f5b52575d644c 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -235,7 +235,13 @@ public abstract class BaseSpawner {

diff --git a/...-to-changed-postToMainThread-method.patch → ...-to-changed-postToMainThread-method.patch b/...-to-changed-postToMainThread-method.patch → ...-to-changed-postToMainThread-method.patch
diff --git a/...-item-frames-are-modified-MC-123450.patch → ...-item-frames-are-modified-MC-123450.patch b/...-item-frames-are-modified-MC-123450.patch → ...-item-frames-are-modified-MC-123450.patch
diff --git a/...0317-Implement-CraftBlockSoundGroup.patch → ...0316-Implement-CraftBlockSoundGroup.patch b/...0317-Implement-CraftBlockSoundGroup.patch → ...0316-Implement-CraftBlockSoundGroup.patch
diff --git a/...e-Keep-Spawn-Loaded-range-per-world.patch → ...e-Keep-Spawn-Loaded-range-per-world.patch b/...e-Keep-Spawn-Loaded-range-per-world.patch → ...e-Keep-Spawn-Loaded-range-per-world.patch
@@ -64,7 +64,7 @@ index 412380f4bfe8a2d50090904124242e8b2c7bfa1b..1a21f7e590aaeca131256dd7079b9546
          // CraftBukkit start
          // this.updateMobSpawningFlags();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 798ddd562f7dcf97f24cc356742d31befb9eef3e..f7e965d1764f7431eaf2673c7bb0a26a1406207a 100644
+index 0ba8f25d7f54ec2ed9e15a3cf7016464741c0de0..0c5065ac62d8a708f70282e765277866834169bc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -64,6 +64,7 @@ import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
@@ -200,7 +200,7 @@ index 4d2348df25410a0b5364eec066880326d6667dad..286aad3205ef8a9e21a47ef07893844f
          this.maxCount = i * i;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5e16798c836d46d08d42a27c549dbdc119803966..919ea3ee6be9877938f9f7743b74b737793bae1d 100644
+index ce61a2b5b3dfb15e8aeb6816f6c6b1b9e3a9d725..f3235c80c6eecdeade88ddafaf39c52beadda684 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1346,15 +1346,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {

diff --git a/...19-Allow-Saving-of-Oversized-Chunks.patch → ...18-Allow-Saving-of-Oversized-Chunks.patch b/...19-Allow-Saving-of-Oversized-Chunks.patch → ...18-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/...20-Expose-the-internal-current-tick.patch → ...19-Expose-the-internal-current-tick.patch b/...20-Expose-the-internal-current-tick.patch → ...19-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dd7eebe8397764206e07809293f1b8ca4e8f205c..a7ee6b54e763d5ff2eb4afdbccdf5becb4e1f305 100644
+index 6a893d44ee85d53ce131ba6c35bbb8c8bfe87b0a..c8979c8f51cf07824fc2780c5daccc30922bbd80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2663,5 +2663,10 @@ public final class CraftServer implements Server {

diff --git a/...21-Fix-World-isChunkGenerated-calls.patch → ...20-Fix-World-isChunkGenerated-calls.patch b/...21-Fix-World-isChunkGenerated-calls.patch → ...20-Fix-World-isChunkGenerated-calls.patch
diff --git a/...te-location-if-we-failed-to-read-it.patch → ...te-location-if-we-failed-to-read-it.patch b/...te-location-if-we-failed-to-read-it.patch → ...te-location-if-we-failed-to-read-it.patch
diff --git a/...l-Spawned-mobs-towards-natural-spaw.patch → ...l-Spawned-mobs-towards-natural-spaw.patch b/...l-Spawned-mobs-towards-natural-spaw.patch → ...l-Spawned-mobs-towards-natural-spaw.patch
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index ac5fa1d9e4e8f9057e3c3780fda3660bb7795295..eb4d06cb115f9b923b0441c341523d0df0392049 100644
+index 96a3e97b509839e265dc83a7961ed0bd2c9d74f8..3b8ea490e7b8bd1a6df624e4eb5c7edccaeb800f 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -87,6 +87,13 @@ public final class NaturalSpawner {

diff --git a/...urable-projectile-relative-velocity.patch → ...urable-projectile-relative-velocity.patch b/...urable-projectile-relative-velocity.patch → ...urable-projectile-relative-velocity.patch
@@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 2dfe2e655026e6da1f548779ab3b455a6e42fb0c..66c3f374a779cd3a4548393ba23e9219f1caf6d3 100644
+index 9379e887af9c15119bbb158dec88a016e649fb7c..68f3131eb5d3c725279796effff083345edbaec9 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -161,7 +161,7 @@ public abstract class Projectile extends Entity {

diff --git a/...rver/0325-offset-item-frame-ticking.patch → ...rver/0324-offset-item-frame-ticking.patch b/...rver/0325-offset-item-frame-ticking.patch → ...rver/0324-offset-item-frame-ticking.patch
diff --git a/patches/server/0326-Fix-MC-158900.patch → patches/server/0325-Fix-MC-158900.patch b/patches/server/0326-Fix-MC-158900.patch → patches/server/0325-Fix-MC-158900.patch
diff --git a/...event-consuming-the-wrong-itemstack.patch → ...event-consuming-the-wrong-itemstack.patch b/...event-consuming-the-wrong-itemstack.patch → ...event-consuming-the-wrong-itemstack.patch
diff --git a/...8-Dont-send-unnecessary-sign-update.patch → ...7-Dont-send-unnecessary-sign-update.patch b/...8-Dont-send-unnecessary-sign-update.patch → ...7-Dont-send-unnecessary-sign-update.patch
diff --git a/...-option-to-disable-pillager-patrols.patch → ...-option-to-disable-pillager-patrols.patch b/...-option-to-disable-pillager-patrols.patch → ...-option-to-disable-pillager-patrols.patch
diff --git a/...330-Flat-bedrock-generator-settings.patch → ...329-Flat-bedrock-generator-settings.patch b/...330-Flat-bedrock-generator-settings.patch → ...329-Flat-bedrock-generator-settings.patch
diff --git a/...k-loads-when-villagers-try-to-find-.patch → ...k-loads-when-villagers-try-to-find-.patch b/...k-loads-when-villagers-try-to-find-.patch → ...k-loads-when-villagers-try-to-find-.patch
diff --git a/...656-Fix-Follow-Range-Initial-Target.patch → ...656-Fix-Follow-Range-Initial-Target.patch b/...656-Fix-Follow-Range-Initial-Target.patch → ...656-Fix-Follow-Range-Initial-Target.patch
diff --git a/.../0333-Duplicate-UUID-Resolve-Option.patch → .../0332-Duplicate-UUID-Resolve-Option.patch b/.../0333-Duplicate-UUID-Resolve-Option.patch → .../0332-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0334-Optimize-Hoppers.patch → patches/server/0333-Optimize-Hoppers.patch b/patches/server/0334-Optimize-Hoppers.patch → patches/server/0333-Optimize-Hoppers.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d6ca6ef7262e25620aceda589d21363193c70310..aa52b644b7af9261fdec06b29b7daa7ad8f89b3a 100644
+index 1a21f7e590aaeca131256dd7079b9546710ca9ad..eeb794d96ac8cbe36b788d390e638192182a21c8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1405,6 +1405,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

diff --git a/...ayerDeathEvent-shouldDropExperience.patch → ...ayerDeathEvent-shouldDropExperience.patch b/...ayerDeathEvent-shouldDropExperience.patch → ...ayerDeathEvent-shouldDropExperience.patch
diff --git a/...ading-chunks-checking-hive-position.patch → ...ading-chunks-checking-hive-position.patch b/...ading-chunks-checking-hive-position.patch → ...ading-chunks-checking-hive-position.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent bees loading chunks checking hive position
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 255ebdcddb46653d70b810b8ca94b86ccde80343..bdc9911f5a72d2f23a3a01d0420ac9ba6cb78570 100644
+index 599cf33fe766539deba246feb724943dbefa2aab..c5069740e922dc6028ba98f2fe9edac216780a19 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -496,6 +496,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {

diff --git a/...hunks-from-Hoppers-and-other-things.patch → ...hunks-from-Hoppers-and-other-things.patch b/...hunks-from-Hoppers-and-other-things.patch → ...hunks-from-Hoppers-and-other-things.patch
diff --git a/...ializing-mismatching-chunk-coordina.patch → ...ializing-mismatching-chunk-coordina.patch b/...ializing-mismatching-chunk-coordina.patch → ...ializing-mismatching-chunk-coordina.patch
diff --git a/...imise-IEntityAccess-getPlayerByUUID.patch → ...imise-IEntityAccess-getPlayerByUUID.patch b/...imise-IEntityAccess-getPlayerByUUID.patch → ...imise-IEntityAccess-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
 Use the world entity map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a9acb6bd32609489e7442188209f3b7c771eb52f..faee1edda215fa72f5b7e1bdbbeb01004d019b0d 100644
+index 0c5065ac62d8a708f70282e765277866834169bc..878123befd7580082cf85222fa3a331baf41156c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -423,6 +423,14 @@ public class ServerLevel extends Level implements WorldGenLevel {

diff --git a/...340-Fix-items-not-falling-correctly.patch → ...339-Fix-items-not-falling-correctly.patch b/...340-Fix-items-not-falling-correctly.patch → ...339-Fix-items-not-falling-correctly.patch
diff --git a/...s/server/0341-Lag-compensate-eating.patch → ...s/server/0340-Lag-compensate-eating.patch b/...s/server/0341-Lag-compensate-eating.patch → ...s/server/0340-Lag-compensate-eating.patch
diff --git a/...ize-call-to-getFluid-for-explosions.patch → ...ize-call-to-getFluid-for-explosions.patch b/...ize-call-to-getFluid-for-explosions.patch → ...ize-call-to-getFluid-for-explosions.patch
diff --git a/...-in-stack-not-having-effects-when-d.patch → ...-in-stack-not-having-effects-when-d.patch b/...-in-stack-not-having-effects-when-d.patch → ...-in-stack-not-having-effects-when-d.patch
diff --git a/...Add-effect-to-block-break-naturally.patch → ...Add-effect-to-block-break-naturally.patch b/...Add-effect-to-block-break-naturally.patch → ...Add-effect-to-block-break-naturally.patch
diff --git a/...er/0345-Entity-Activation-Range-2.0.patch → ...er/0344-Entity-Activation-Range-2.0.patch b/...er/0345-Entity-Activation-Range-2.0.patch → ...er/0344-Entity-Activation-Range-2.0.patch
@@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms
 Adds villagers as separate config
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index faee1edda215fa72f5b7e1bdbbeb01004d019b0d..4a06da72c8b769c683e9eb03817bd9381a0cf099 100644
+index 878123befd7580082cf85222fa3a331baf41156c..1433ece7d85de61271ec619b68e09ecfd46b3f24 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
@@ -341,7 +341,7 @@ index 3f8990d15bd6815db0ccb924e621dfcc3220e0e0..70f1916185b79bbb9f033f4ef8119d7b
 +
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cb7e92f2694cefeecebc840959a01e1e1945061a..10a5315c6a2f872d88c080910eeca140ac6fbbc4 100644
+index 7ba3e9a2f974cd469d256dbfbdbfcb05b644c1ba..46f8bf8a0f97c83824248c0d39681430807bd0ca 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -158,6 +158,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

diff --git a/...rver/0346-Increase-Light-Queue-Size.patch → ...rver/0345-Increase-Light-Queue-Size.patch b/...rver/0346-Increase-Light-Queue-Size.patch → ...rver/0345-Increase-Light-Queue-Size.patch
@@ -14,7 +14,7 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aa52b644b7af9261fdec06b29b7daa7ad8f89b3a..668d7479bb9a56f710ead272166abd615b9463cc 100644
+index eeb794d96ac8cbe36b788d390e638192182a21c8..ba99b3ffef6d5c46c3bb0b0de99a042ae000c196 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -780,7 +780,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

diff --git a/patches/server/0347-Anti-Xray.patch → patches/server/0346-Anti-Xray.patch b/patches/server/0347-Anti-Xray.patch → patches/server/0346-Anti-Xray.patch
@@ -1044,7 +1044,7 @@ index 7825d6f0fdcfda6212cff8033ec55fb7db236154..000853110c7a89f2d0403a7a2737025a
 
      public ClientboundLevelChunkWithLightPacket(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 9223b2c90bca5ed82ba424d936fc85b4fc1dba18..19432d3408bfa806bc415dc3f148e154eeb802fc 100644
+index d97e017289783cd8795e055616dd5931bb6147cd..7c4eded1135e50f2ffea069de7bcd77bd80d0ac1 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -618,7 +618,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1079,7 +1079,7 @@ index 9223b2c90bca5ed82ba424d936fc85b4fc1dba18..19432d3408bfa806bc415dc3f148e154
          List<Entity> list = Lists.newArrayList();
          List<Entity> list1 = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4a06da72c8b769c683e9eb03817bd9381a0cf099..b8ac1df1f2e2114a16d417b31fbbbc734074b2b6 100644
+index 1433ece7d85de61271ec619b68e09ecfd46b3f24..7aaa8e7bfc2a949346dc760a5ff1231f80d410d5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -434,7 +434,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1114,7 +1114,7 @@ index 3fadf6b46cc722ad81cf810c0761cf717e9f9b78..af00442931f9f6cf878bd61137c2f29f
 
      public void destroyAndAck(BlockPos pos, int sequence, String reason) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 10a5315c6a2f872d88c080910eeca140ac6fbbc4..0dd6ccc5b281ea46d2d12eb99c28335bdbe66d7e 100644
+index 46f8bf8a0f97c83824248c0d39681430807bd0ca..7e03e88dc7196d757ffcc6cdc2ca15c96abcc2a0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1178,7 +1178,7 @@ index 41e61e6c128f22224665af3f07cd11d69a43062b..54e57791f6220325d05939decae46dc4
          }
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 5cd8755dc8db2f1fdb32d2db3a5a137ca7cad3c7..bc573695ace324c7cd536bc24fbfc66a53ef9fa0 100644
+index 0493be4a898962ef80aa6ae6fb61f0a755540ab8..fb42b212805c8ea9ae5be8b2a515a37ecda28535 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -93,7 +93,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1524,7 +1524,7 @@ index 1827fdc551095ab411d6b43b94106273f53386c8..7f23c69e7d6232190a2c75cbc79e1ea5
 
      public CraftChunk(net.minecraft.world.level.chunk.LevelChunk chunk) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a7ee6b54e763d5ff2eb4afdbccdf5becb4e1f305..826bd8ae116a94ddc59815d4dbb37ffee71780e7 100644
+index c8979c8f51cf07824fc2780c5daccc30922bbd80..bb930f03af4c649eba0dbde356ad098023070832 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2235,7 +2235,7 @@ public final class CraftServer implements Server {
@@ -1537,7 +1537,7 @@ index a7ee6b54e763d5ff2eb4afdbccdf5becb4e1f305..826bd8ae116a94ddc59815d4dbb37ffe
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 37efb3305b4f740d9092c2a253b93f1925ee75d5..414522b641cd866822c13a753cc623c463004fd6 100644
+index 7ff5943949aea15d7b8a48f01ce8e8cb98c78532..c3703933598ee96d856a18dcc0932061959c9791 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -410,11 +410,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {

diff --git a/...ement-alternative-item-despawn-rate.patch → ...ement-alternative-item-despawn-rate.patch b/...ement-alternative-item-despawn-rate.patch → ...ement-alternative-item-despawn-rate.patch
diff --git a/...er/0349-Tracking-Range-Improvements.patch → ...er/0348-Tracking-Range-Improvements.patch b/...er/0349-Tracking-Range-Improvements.patch → ...er/0348-Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 19432d3408bfa806bc415dc3f148e154eeb802fc..442d720783b43254d95b7fa62776f70605644ec1 100644
+index 7c4eded1135e50f2ffea069de7bcd77bd80d0ac1..ec352a1916bea3893173375cfeaf84fc1c3cc52a 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1285,6 +1285,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

diff --git a/...-items-vanishing-through-end-portal.patch → ...-items-vanishing-through-end-portal.patch b/...-items-vanishing-through-end-portal.patch → ...-items-vanishing-through-end-portal.patch
diff --git a/...ment-optional-per-player-mob-spawns.patch → ...ment-optional-per-player-mob-spawns.patch b/...ment-optional-per-player-mob-spawns.patch → ...ment-optional-per-player-mob-spawns.patch
diff --git a/...et-gravity-in-void.-Fixes-MC-167279.patch → ...et-gravity-in-void.-Fixes-MC-167279.patch b/...et-gravity-in-void.-Fixes-MC-167279.patch → ...et-gravity-in-void.-Fixes-MC-167279.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index bdc9911f5a72d2f23a3a01d0420ac9ba6cb78570..d94f045d7fe928c256c5d3e1af02ac73d7897f5a 100644
+index c5069740e922dc6028ba98f2fe9edac216780a19..6efa135bb149e1dbe05d1b8c4af82bd38b4aa37c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -143,7 +143,22 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {

diff --git a/...-getChunkAt-calls-for-loaded-chunks.patch → ...-getChunkAt-calls-for-loaded-chunks.patch b/...-getChunkAt-calls-for-loaded-chunks.patch → ...-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 2d0a8668d1828fe085631079798a36374a0d4844..f3375712ae25ef1503a030b3059477f350d922da 100644
+index 8b8c8970e1d478edc3a0231556bf92f8263392c1..800dc1f2f5ef6026704e17583421f7b54d2ac631 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -420,6 +420,12 @@ public class ServerChunkCache extends ChunkSource {