From 4c1b338e0fcce78cb6e75f04afac8d4be5e1a86f Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 8 Jun 2022 19:33:07 +0200 Subject: [PATCH] Remove level propagator patch for now --- .../1.19}/0847-Replace-ticket-level-propagator.patch | 2 ++ ...cipesUsed-API.patch => 0847-Furnace-RecipesUsed-API.patch} | 0 ...ch => 0848-Configurable-sculk-sensor-listener-range.patch} | 0 ...patch => 0849-Add-missing-block-data-mins-and-maxes.patch} | 0 ...ption-to-have-default-CustomSpawners-in-custom-worl.patch} | 2 +- ...1-Put-world-into-worldlist-before-initing-the-world.patch} | 4 ++-- ...ion-Desync.patch => 0852-Fix-Entity-Position-Desync.patch} | 0 ...stom-Potion-Mixes.patch => 0853-Custom-Potion-Mixes.patch} | 4 ++-- ...method.patch => 0854-Fix-Fluid-tags-isTagged-method.patch} | 0 ...ture.patch => 0855-Fix-World-locateNearestStructure.patch} | 0 ...reen.patch => 0856-Force-close-world-loading-screen.patch} | 0 ...thods.patch => 0857-Fix-falling-block-spawn-methods.patch} | 0 ...s.patch => 0858-Expose-furnace-minecart-push-values.patch} | 0 ...ix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} | 0 ...hutdown.patch => 0860-Fix-save-problems-on-shutdown.patch} | 0 ...re-Projectile-API.patch => 0861-More-Projectile-API.patch} | 0 ...patch => 0862-Fix-swamp-hut-cat-generation-deadlock.patch} | 0 ...on-t-allow-vehicle-movement-from-players-while-tele.patch} | 0 ...me-API.patch => 0864-Implement-getComputedBiome-API.patch} | 0 ...-nonnull.patch => 0865-Make-some-itemstacks-nonnull.patch} | 0 ...dd-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch} | 0 ...s-API.patch => 0867-Implement-enchantWithLevels-API.patch} | 0 ...unloadWorld.patch => 0868-Fix-saving-in-unloadWorld.patch} | 0 ...Block-calls.patch => 0869-Buffer-OOB-setBlock-calls.patch} | 0 ...geEvent.patch => 0870-Add-TameableDeathMessageEvent.patch} | 0 ...ix-new-block-data-for-EntityChangeBlockEvent-when-s.patch} | 0 ...ix-player-loottables-running-when-mob-loot-gamerule.patch} | 0 ...Ensure-entity-passenger-world-matches-ridden-entity.patch} | 0 ...atch => 0874-Guard-against-invalid-entity-positions.patch} | 0 ...che-resource-keys.patch => 0875-cache-resource-keys.patch} | 0 ...0876-Allow-to-change-the-podium-for-the-EnderDragon.patch} | 0 ...ix-NBT-pieces-overriding-a-block-entity-during-worl.patch} | 0 ...878-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} | 0 ...h => 0879-Prevent-tile-entity-copies-loading-chunks.patch} | 0 ...se-username-instead-of-display-name-in-PlayerList-g.patch} | 0 ...ix-slime-spawners-not-spawning-outside-slime-chunks.patch} | 0 ...tch => 0882-Pass-ServerLevel-for-gamerule-callbacks.patch} | 0 ...-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} | 0 ...wnLoaded.patch => 0884-WorldCreator-keepSpawnLoaded.patch} | 0 ...atch => 0885-Fix-NPE-for-BlockDataMeta-getBlockData.patch} | 0 ...rigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} | 0 ...87-Add-EntityDyeEvent-and-CollarColorable-interface.patch} | 0 ...ch => 0888-Fire-CauldronLevelChange-on-initial-fill.patch} | 0 ...0889-fix-powder-snow-cauldrons-not-turning-to-water.patch} | 0 ...anup-filtering.patch => 0890-Sign-cleanup-filtering.patch} | 0 ...temEvent.patch => 0891-Add-PlayerStopUsingItemEvent.patch} | 0 ...ting.patch => 0892-FallingBlock-auto-expire-setting.patch} | 0 ...Don-t-tick-markers.patch => 0893-Don-t-tick-markers.patch} | 0 ...patch => 0894-Do-not-accept-invalid-client-settings.patch} | 0 ...otocol.patch => 0895-Add-support-for-Proxy-Protocol.patch} | 0 ...patch => 0896-Fix-OfflinePlayer-getBedSpawnLocation.patch} | 0 ...Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} | 0 ...ity-NBT.patch => 0898-Sanitize-Sent-BlockEntity-NBT.patch} | 0 ...> 0899-Prevent-entity-loading-causing-async-lookups.patch} | 0 ...isable-component-selector-resolving-in-books-by-def.patch} | 0 ...-Throw-exception-on-world-create-while-being-ticked.patch} | 0 ... 0902-Add-Alternate-Current-redstone-implementation.patch} | 0 57 files changed, 7 insertions(+), 5 deletions(-) rename patches/{server => removed/1.19}/0847-Replace-ticket-level-propagator.patch (99%) rename patches/server/{0848-Furnace-RecipesUsed-API.patch => 0847-Furnace-RecipesUsed-API.patch} (100%) rename patches/server/{0849-Configurable-sculk-sensor-listener-range.patch => 0848-Configurable-sculk-sensor-listener-range.patch} (100%) rename patches/server/{0850-Add-missing-block-data-mins-and-maxes.patch => 0849-Add-missing-block-data-mins-and-maxes.patch} (100%) rename patches/server/{0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (97%) rename patches/server/{0852-Put-world-into-worldlist-before-initing-the-world.patch => 0851-Put-world-into-worldlist-before-initing-the-world.patch} (91%) rename patches/server/{0853-Fix-Entity-Position-Desync.patch => 0852-Fix-Entity-Position-Desync.patch} (100%) rename patches/server/{0854-Custom-Potion-Mixes.patch => 0853-Custom-Potion-Mixes.patch} (98%) rename patches/server/{0855-Fix-Fluid-tags-isTagged-method.patch => 0854-Fix-Fluid-tags-isTagged-method.patch} (100%) rename patches/server/{0856-Fix-World-locateNearestStructure.patch => 0855-Fix-World-locateNearestStructure.patch} (100%) rename patches/server/{0857-Force-close-world-loading-screen.patch => 0856-Force-close-world-loading-screen.patch} (100%) rename patches/server/{0858-Fix-falling-block-spawn-methods.patch => 0857-Fix-falling-block-spawn-methods.patch} (100%) rename patches/server/{0859-Expose-furnace-minecart-push-values.patch => 0858-Expose-furnace-minecart-push-values.patch} (100%) rename patches/server/{0860-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0859-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%) rename patches/server/{0861-Fix-save-problems-on-shutdown.patch => 0860-Fix-save-problems-on-shutdown.patch} (100%) rename patches/server/{0862-More-Projectile-API.patch => 0861-More-Projectile-API.patch} (100%) rename patches/server/{0863-Fix-swamp-hut-cat-generation-deadlock.patch => 0862-Fix-swamp-hut-cat-generation-deadlock.patch} (100%) rename patches/server/{0864-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0863-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%) rename patches/server/{0865-Implement-getComputedBiome-API.patch => 0864-Implement-getComputedBiome-API.patch} (100%) rename patches/server/{0866-Make-some-itemstacks-nonnull.patch => 0865-Make-some-itemstacks-nonnull.patch} (100%) rename patches/server/{0867-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch => 0866-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch} (100%) rename patches/server/{0868-Implement-enchantWithLevels-API.patch => 0867-Implement-enchantWithLevels-API.patch} (100%) rename patches/server/{0869-Fix-saving-in-unloadWorld.patch => 0868-Fix-saving-in-unloadWorld.patch} (100%) rename patches/server/{0870-Buffer-OOB-setBlock-calls.patch => 0869-Buffer-OOB-setBlock-calls.patch} (100%) rename patches/server/{0871-Add-TameableDeathMessageEvent.patch => 0870-Add-TameableDeathMessageEvent.patch} (100%) rename patches/server/{0872-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch => 0871-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch} (100%) rename patches/server/{0873-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0872-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%) rename patches/server/{0874-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0873-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%) rename patches/server/{0875-Guard-against-invalid-entity-positions.patch => 0874-Guard-against-invalid-entity-positions.patch} (100%) rename patches/server/{0876-cache-resource-keys.patch => 0875-cache-resource-keys.patch} (100%) rename patches/server/{0877-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0876-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%) rename patches/server/{0878-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0877-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%) rename patches/server/{0879-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0878-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%) rename patches/server/{0880-Prevent-tile-entity-copies-loading-chunks.patch => 0879-Prevent-tile-entity-copies-loading-chunks.patch} (100%) rename patches/server/{0881-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0880-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%) rename patches/server/{0882-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0881-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%) rename patches/server/{0883-Pass-ServerLevel-for-gamerule-callbacks.patch => 0882-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%) rename patches/server/{0884-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0883-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%) rename patches/server/{0885-WorldCreator-keepSpawnLoaded.patch => 0884-WorldCreator-keepSpawnLoaded.patch} (100%) rename patches/server/{0886-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0885-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%) rename patches/server/{0887-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0886-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%) rename patches/server/{0888-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0887-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%) rename patches/server/{0889-Fire-CauldronLevelChange-on-initial-fill.patch => 0888-Fire-CauldronLevelChange-on-initial-fill.patch} (100%) rename patches/server/{0890-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0889-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%) rename patches/server/{0891-Sign-cleanup-filtering.patch => 0890-Sign-cleanup-filtering.patch} (100%) rename patches/server/{0892-Add-PlayerStopUsingItemEvent.patch => 0891-Add-PlayerStopUsingItemEvent.patch} (100%) rename patches/server/{0893-FallingBlock-auto-expire-setting.patch => 0892-FallingBlock-auto-expire-setting.patch} (100%) rename patches/server/{0894-Don-t-tick-markers.patch => 0893-Don-t-tick-markers.patch} (100%) rename patches/server/{0895-Do-not-accept-invalid-client-settings.patch => 0894-Do-not-accept-invalid-client-settings.patch} (100%) rename patches/server/{0896-Add-support-for-Proxy-Protocol.patch => 0895-Add-support-for-Proxy-Protocol.patch} (100%) rename patches/server/{0897-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0896-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%) rename patches/server/{0898-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0897-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%) rename patches/server/{0899-Sanitize-Sent-BlockEntity-NBT.patch => 0898-Sanitize-Sent-BlockEntity-NBT.patch} (100%) rename patches/server/{0900-Prevent-entity-loading-causing-async-lookups.patch => 0899-Prevent-entity-loading-causing-async-lookups.patch} (100%) rename patches/server/{0901-Disable-component-selector-resolving-in-books-by-def.patch => 0900-Disable-component-selector-resolving-in-books-by-def.patch} (100%) rename patches/server/{0902-Throw-exception-on-world-create-while-being-ticked.patch => 0901-Throw-exception-on-world-create-while-being-ticked.patch} (100%) rename patches/server/{0903-Add-Alternate-Current-redstone-implementation.patch => 0902-Add-Alternate-Current-redstone-implementation.patch} (100%) diff --git a/patches/server/0847-Replace-ticket-level-propagator.patch b/patches/removed/1.19/0847-Replace-ticket-level-propagator.patch similarity index 99% rename from patches/server/0847-Replace-ticket-level-propagator.patch rename to patches/removed/1.19/0847-Replace-ticket-level-propagator.patch index 392a3870b..e8a3933bf 100644 --- a/patches/server/0847-Replace-ticket-level-propagator.patch +++ b/patches/removed/1.19/0847-Replace-ticket-level-propagator.patch @@ -14,6 +14,8 @@ should help with that. A big side effect is that mid-tick will be more effective, since more time will be allocated to actually processing chunk tasks vs the ticket level updates. +TODO: Causes super funky chunk loading issues + diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java index b22c771ca35466574d5a73f2da3fc8762cb29487..65a76e76cd101298a8cad4d23e0928ef3e08289a 100644 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java diff --git a/patches/server/0848-Furnace-RecipesUsed-API.patch b/patches/server/0847-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0848-Furnace-RecipesUsed-API.patch rename to patches/server/0847-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0849-Configurable-sculk-sensor-listener-range.patch b/patches/server/0848-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0849-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0848-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0850-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0849-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0850-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0849-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 97% rename from patches/server/0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch index 1a0f20075..e8474da6f 100644 --- a/patches/server/0851-Option-to-have-default-CustomSpawners-in-custom-worl.patch +++ b/patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch @@ -24,7 +24,7 @@ index 8fff289a02234cbe5e808fe6e736788a2ed1e5c2..72e17ac76e5f3ac1283bec2133f76bc1 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 47966d87c525067f0bc3d587cdf869d89cf5710c..dc585e962033c991f323d41a8a34e791a7cebe80 100644 +index 90a06ecb242bb5222eccf3839d6d1bcbfde6f680..b4bb70dd7f0275c04d64d7f4f4c2133a1d1f13aa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -585,7 +585,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop