From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martijn Muijsers Date: Sun, 25 Dec 2022 19:39:38 +0100 Subject: [PATCH] Don't load chunks to activate climbing entities License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index ccb2722e8025b97d972cafac5258676cb4a29390..ffb0e9a5c24d7c95f1cc1fe495ac4d76c6362eb8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4519,6 +4519,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return this.feetBlockState; } + // Gale start - don't load chunks to activate climbing entities + public @Nullable BlockState getFeetBlockStateIfLoaded() { + if (this.feetBlockState == null) { + this.feetBlockState = this.level.getBlockStateIfLoaded(this.blockPosition()); + } + + return this.feetBlockState; + } + // Gale end - don't load chunks to activate climbing entities + public ChunkPos chunkPosition() { return this.chunkPosition; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index 2f252bbe2946ea3228933b4b8c91a4e46fe99705..a35891723fad4fe984566c41cdd728004f8f371e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1979,19 +1979,43 @@ public abstract class LivingEntity extends Entity implements Attackable { public boolean onClimbableCached() { if (!this.blockPosition().equals(this.lastClimbingPosition)) { - this.cachedOnClimbable = this.onClimbable(); - this.lastClimbingPosition = this.blockPosition(); + // Gale start - don't load chunks to activate climbing entities + Boolean onClimbableIfLoaded = this.onClimbable(this.level().galeConfig().smallOptimizations.loadChunks.toActivateClimbingEntities); + if (onClimbableIfLoaded != null) { + this.cachedOnClimbable = onClimbableIfLoaded; + this.lastClimbingPosition = this.blockPosition(); + } else { + this.cachedOnClimbable = false; + this.lastClimbingPosition = null; + } + // Gale end - don't load chunks to activate climbing entities } return this.cachedOnClimbable; } // Gale end - Airplane - cache on climbable check public boolean onClimbable() { + // Gale start - don't load chunks to activate climbing entities + return onClimbable(true); + } + + public Boolean onClimbable(boolean loadChunk) { + // Gale end - don't load chunks to activate climbing entities if (this.isSpectator()) { return false; } else { BlockPos blockposition = this.blockPosition(); - BlockState iblockdata = this.getFeetBlockState(); + // Gale start - don't load chunks to activate climbing entities + BlockState iblockdata; + if (loadChunk) { + iblockdata = this.getFeetBlockState(); + } else { + iblockdata = this.getFeetBlockStateIfLoaded(); + if (iblockdata == null) { + return null; + } + } + // Gale end - don't load chunks to activate climbing entities if (iblockdata.is(BlockTags.CLIMBABLE)) { this.lastClimbablePos = Optional.of(blockposition); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java index e20a48ef23e3eb186f6564102c9146de206282c3..589ba88b01f23ba9d0b2396e03b0885e88302ab5 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -283,6 +283,18 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean toSpawnPhantoms = false; // Gale end - MultiPaper - don't load chunks to spawn phantoms + // Gale start - don't load chunks to activate climbing entities + /** + * Whether to load chunks to check whether entities are on a climbable block. If false, + * entities in unloaded chunks will be assumed to not be on a climbable block. + * + */ + public boolean toActivateClimbingEntities = false; + // Gale end - don't load chunks to activate climbing entities + } }