Added config to disable entity tick catchers

LuminolMC · Aug 7, 2024 · d15f277 · d15f277
1 parent b27cf96
commit d15f277
Show file tree

Hide file tree

Showing 42 changed files with 53 additions and 8 deletions.
diff --git a/patches/server/0016-Add-config-to-disable-entity-tick-catchers.patch b/patches/server/0016-Add-config-to-disable-entity-tick-catchers.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <wangxyper@163.com>
+Date: Wed, 7 Aug 2024 14:27:24 +0800
+Subject: [PATCH] Add config to disable entity tick catchers
+
+
+diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/DisableEntityCatchConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/DisableEntityCatchConfig.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..0fd71151a85dd87c2294033e2e7512ac365caa62
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/config/modules/experiment/DisableEntityCatchConfig.java
+@@ -0,0 +1,20 @@
++package me.earthme.luminol.config.modules.experiment;
++
++import me.earthme.luminol.config.ConfigInfo;
++import me.earthme.luminol.config.EnumConfigCategory;
++import me.earthme.luminol.config.IConfigModule;
++
++public class DisableEntityCatchConfig implements IConfigModule {
++    @ConfigInfo(baseName = "enabled")
++    public static boolean enabled = false;
++
++    @Override
++    public EnumConfigCategory getCategory() {
++        return EnumConfigCategory.EXPERIMENT;
++    }
++
++    @Override
++    public String getBaseName() {
++        return "disable_entity_exception_catchers";
++    }
++}
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index 4bb14874912557008fab7361754f2d2eb98fc5aa..38725e383cce13e372dacfa59f8668235ff6e3a5 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -1468,7 +1468,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+         try {
+             tickConsumer.accept(entity);
+         } catch (Throwable throwable) {
+-            if (throwable instanceof ThreadDeath) throw throwable; // Paper
++            if (throwable instanceof ThreadDeath || me.earthme.luminol.config.modules.experiment.DisableEntityCatchConfig.enabled) throw throwable; // Paper // Luminol
+             // Paper start - Prevent block entity and entity crashes
+             final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
+             MinecraftServer.LOGGER.error(msg, throwable);
diff --git a/...-fixing-folia-spector-teleportation.patch → ...-fixing-folia-spector-teleportation.patch b/...-fixing-folia-spector-teleportation.patch → ...-fixing-folia-spector-teleportation.patch
diff --git a/...-entity-was-moving-to-another-regio.patch → ...-entity-was-moving-to-another-regio.patch b/...-entity-was-moving-to-another-regio.patch → ...-entity-was-moving-to-another-regio.patch
@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..0e51d465db3554ac80d00c6b85cc1f01
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dfac4257d8de1a607ff952a1b27f61f3b4329516..f153159600fe14eff770b426fde318a4bd4b5b44 100644
+index a949998d40e5113db87f887f8c80067218dd33b3..6f6ae49cf8918e00e4469f0e5fa4a03aa25d19d4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1123,6 +1123,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...olia-off-region-POI-accessing-issue.patch → ...olia-off-region-POI-accessing-issue.patch b/...olia-off-region-POI-accessing-issue.patch → ...olia-off-region-POI-accessing-issue.patch
diff --git a/...sync-calling-during-moving-event-be.patch → ...sync-calling-during-moving-event-be.patch b/...sync-calling-during-moving-event-be.patch → ...sync-calling-during-moving-event-be.patch
@@ -74,7 +74,7 @@ index 73057c695addefd9c8fa0949743803fdeab60dda..a6a05faf46aa236e6734cfe2f6a90d25
                                      // If the event is cancelled we move the player back to their old location.
                                      if (event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f153159600fe14eff770b426fde318a4bd4b5b44..fe3aeadd4357cc0b28ac9cfc21f0f1100d22d3a0 100644
+index 6f6ae49cf8918e00e4469f0e5fa4a03aa25d19d4..a90820a672379639e89c5bb71abcd9aa69227473 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4073,6 +4073,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...Try-optimizing-the-task-dispatching.patch → ...Try-optimizing-the-task-dispatching.patch b/...Try-optimizing-the-task-dispatching.patch → ...Try-optimizing-the-task-dispatching.patch
diff --git a/...-Force-disable-builtin-spark-plugin.patch → ...-Force-disable-builtin-spark-plugin.patch b/...-Force-disable-builtin-spark-plugin.patch → ...-Force-disable-builtin-spark-plugin.patch
diff --git a/...e-getting-block-state-while-tripwir.patch → ...e-getting-block-state-while-tripwir.patch b/...e-getting-block-state-while-tripwir.patch → ...e-getting-block-state-while-tripwir.patch
diff --git a/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch b/...aiiju-Don-t-pathfind-outside-region.patch → ...aiiju-Don-t-pathfind-outside-region.patch
diff --git a/...ju-Vanilla-end-portal-teleportation.patch → ...ju-Vanilla-end-portal-teleportation.patch b/...ju-Vanilla-end-portal-teleportation.patch → ...ju-Vanilla-end-portal-teleportation.patch
diff --git a/...erver/0025-Petal-Reduce-sensor-work.patch → ...erver/0026-Petal-Reduce-sensor-work.patch b/...erver/0025-Petal-Reduce-sensor-work.patch → ...erver/0026-Petal-Reduce-sensor-work.patch
diff --git a/...ish-Improve-fluid-direction-caching.patch → ...ish-Improve-fluid-direction-caching.patch b/...ish-Improve-fluid-direction-caching.patch → ...ish-Improve-fluid-direction-caching.patch
diff --git a/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch b/...Cache-climbing-check-for-activation.patch → ...Cache-climbing-check-for-activation.patch
diff --git a/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch b/...erfish-Reduce-chunk-loading-lookups.patch → ...erfish-Reduce-chunk-loading-lookups.patch
diff --git a/...return-optimization-for-target-find.patch → ...return-optimization-for-target-find.patch b/...return-optimization-for-target-find.patch → ...return-optimization-for-target-find.patch
diff --git a/...per-6045-block-goal-shouldn-t-load-.patch → ...per-6045-block-goal-shouldn-t-load-.patch b/...per-6045-block-goal-shouldn-t-load-.patch → ...per-6045-block-goal-shouldn-t-load-.patch
diff --git a/...erfish-Skip-cloning-loot-parameters.patch → ...erfish-Skip-cloning-loot-parameters.patch b/...erfish-Skip-cloning-loot-parameters.patch → ...erfish-Skip-cloning-loot-parameters.patch
diff --git a/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch b/...ish-Reduce-projectile-chunk-loading.patch → ...ish-Reduce-projectile-chunk-loading.patch
diff --git a/...s/server/0033-Pufferfish-Entity-TTL.patch → ...s/server/0034-Pufferfish-Entity-TTL.patch b/...s/server/0033-Pufferfish-Entity-TTL.patch → ...s/server/0034-Pufferfish-Entity-TTL.patch
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..15697d69659b6e1e776acf5094684b5f
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 794f08a815672b18d22416fc5787f886f895f7be..8a8ad0952ac5f128aeabc0856426227bfb7b9893 100644
+index 2072a4ca67f131212b71570e1eeb0d4755b64993..88ee5f9f8fc453d0dc18547a8c2823fa56ce8579 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -858,6 +858,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch b/...ferfish-Dynamic-Activation-of-Brain.patch → ...ferfish-Dynamic-Activation-of-Brain.patch
@@ -83,7 +83,7 @@ index b5cb700e2cd1de2f78ad582245208c056fa6fa79..80123dd30328336b02a5e2e3414ece44
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8a8ad0952ac5f128aeabc0856426227bfb7b9893..229c3d25a5999b0304b06a57819a5108c823784d 100644
+index 88ee5f9f8fc453d0dc18547a8c2823fa56ce8579..e8984feea7fb06600329bae05b15d317f8ae78a0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -430,6 +430,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch b/...heck-for-spooky-season-once-an-hour.patch → ...heck-for-spooky-season-once-an-hour.patch
diff --git a/...036-Pufferfish-Optimize-suffocation.patch → ...037-Pufferfish-Optimize-suffocation.patch b/...036-Pufferfish-Optimize-suffocation.patch → ...037-Pufferfish-Optimize-suffocation.patch
diff --git a/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch b/...le-goal-selector-during-inactive-ti.patch → ...le-goal-selector-during-inactive-ti.patch
diff --git a/...r-ShapelessRecipes-comparison-for-V.patch → ...r-ShapelessRecipes-comparison-for-V.patch b/...r-ShapelessRecipes-comparison-for-V.patch → ...r-ShapelessRecipes-comparison-for-V.patch
diff --git a/...rver/0039-Pufferfish-SIMD-Utilities.patch → ...rver/0040-Pufferfish-SIMD-Utilities.patch b/...rver/0039-Pufferfish-SIMD-Utilities.patch → ...rver/0040-Pufferfish-SIMD-Utilities.patch
diff --git a/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch b/...le-Variable-entity-wake-up-duration.patch → ...le-Variable-entity-wake-up-duration.patch
diff --git a/...er/0041-Gale-Optimize-sun-burn-tick.patch → ...er/0042-Gale-Optimize-sun-burn-tick.patch b/...er/0041-Gale-Optimize-sun-burn-tick.patch → ...er/0042-Gale-Optimize-sun-burn-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Optimize sun burn tick
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 229c3d25a5999b0304b06a57819a5108c823784d..9994b61afcaa9cb93bda9f1e1db17708d95277fa 100644
+index e8984feea7fb06600329bae05b15d317f8ae78a0..071de4ddcff846f469d510b4147c3ed3cb31d7af 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -315,7 +315,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...42-Gale-Use-platform-math-functions.patch → ...43-Gale-Use-platform-math-functions.patch b/...42-Gale-Use-platform-math-functions.patch → ...43-Gale-Use-platform-math-functions.patch
diff --git a/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch b/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9994b61afcaa9cb93bda9f1e1db17708d95277fa..45871e846223dc78aee8a8ffb087b0f0763dca67 100644
+index 071de4ddcff846f469d510b4147c3ed3cb31d7af..aeeef108f7d45c3a420874c7de769e4fb9097af0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...0044-Gale-Optimize-noise-generation.patch → ...0045-Gale-Optimize-noise-generation.patch b/...0044-Gale-Optimize-noise-generation.patch → ...0045-Gale-Optimize-noise-generation.patch
diff --git a/...045-Gale-Faster-chunk-serialization.patch → ...046-Gale-Faster-chunk-serialization.patch b/...045-Gale-Faster-chunk-serialization.patch → ...046-Gale-Faster-chunk-serialization.patch
diff --git a/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch b/...a-and-Optional-allocation-in-Entity.patch → ...a-and-Optional-allocation-in-Entity.patch
diff --git a/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch b/...ttle-tracker-map-with-optimized-col.patch → ...ttle-tracker-map-with-optimized-col.patch
diff --git a/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch b/...parkly-Paper-Optimize-canSee-checks.patch → ...parkly-Paper-Optimize-canSee-checks.patch
diff --git a/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch b/...-MapItem-update-if-the-map-does-not.patch → ...-MapItem-update-if-the-map-does-not.patch
diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch
diff --git a/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch b/...I-and-display-of-chunkhot-in-tpsbar.patch → ...I-and-display-of-chunkhot-in-tpsbar.patch
@@ -332,7 +332,7 @@ index 1859477e96709368683fe5707327e92f56fbfc8e..4c4814094552fa4382b1cbe649f24f47
 +    // KioCG end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 45871e846223dc78aee8a8ffb087b0f0763dca67..d860f32f507cc4d642213a6da8227314660c4ca0 100644
+index aeeef108f7d45c3a420874c7de769e4fb9097af0..3d304852c51eb6aec99c766fb73fc4cb7382ad0b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -5856,4 +5856,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...2-Purpur-use-alternative-keep-alive.patch → ...3-Purpur-use-alternative-keep-alive.patch b/...2-Purpur-use-alternative-keep-alive.patch → ...3-Purpur-use-alternative-keep-alive.patch
diff --git a/...053-Leaf-Skip-event-if-no-listeners.patch → ...054-Leaf-Skip-event-if-no-listeners.patch b/...053-Leaf-Skip-event-if-no-listeners.patch → ...054-Leaf-Skip-event-if-no-listeners.patch
diff --git a/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch b/...-start-tick-and-finished-tick-event.patch → ...-start-tick-and-finished-tick-event.patch
diff --git a/patches/server/0055-Fix-MC-2025.patch → patches/server/0056-Fix-MC-2025.patch b/patches/server/0055-Fix-MC-2025.patch → patches/server/0056-Fix-MC-2025.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix-MC-2025
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d860f32f507cc4d642213a6da8227314660c4ca0..8e64056ed83a08037e9c5a06a03233600671637b 100644
+index 3d304852c51eb6aec99c766fb73fc4cb7382ad0b..701c3513e5c11204336502b822b79f2f333ad2e3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2623,6 +2623,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...er/0056-FoliaPR-Add-TPS-From-Region.patch → ...er/0057-FoliaPR-Add-TPS-From-Region.patch b/...er/0056-FoliaPR-Add-TPS-From-Region.patch → ...er/0057-FoliaPR-Add-TPS-From-Region.patch