9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 00:39:22 +00:00
Files
Gale/patches/server/0105-Don-t-load-chunks-to-activate-climbing-entities.patch
2024-07-05 00:05:50 +08:00

93 lines
4.5 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martijn Muijsers <martijnmuijsers@live.nl>
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 47f94388024f1618549d9cafa6a8c2bb24d7279d..d0599a0a41d4bfc1a2063ef4228402da00e1a06c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4493,6 +4493,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return this.inBlockState;
}
+ // Gale start - don't load chunks to activate climbing entities
+ public @Nullable BlockState getInBlockStateIfLoaded() {
+ if (this.inBlockState == null) {
+ this.inBlockState = this.level.getBlockStateIfLoaded(this.blockPosition());
+ }
+
+ return this.inBlockState;
+ }
+ // 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 6b1b16c0ade335058834c01d9d760ef0a76928ca..15ba997a722530a5461d3a66b9fbed26b5312a37 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2047,19 +2047,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.getInBlockState();
+ // Gale start - don't load chunks to activate climbing entities
+ BlockState iblockdata;
+ if (loadChunk) {
+ iblockdata = this.getInBlockState();
+ } else {
+ iblockdata = this.getInBlockStateIfLoaded();
+ 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 7f13c5c2a9185104cd958b75c45f4ba02cda0c95..269393f8b56ed5b5e37879c23fe1e28b5a82ebe0 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -95,6 +95,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public LoadChunks loadChunks;
public class LoadChunks extends ConfigurationPart {
public boolean toSpawnPhantoms = false; // Gale - MultiPaper - don't load chunks to spawn phantoms
+ public boolean toActivateClimbingEntities = false; // Gale - don't load chunks to activate climbing entities
}
}