aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2021-12-08 22:00:45 -0800
committerSpottedleaf <[email protected]>2021-12-08 22:00:45 -0800
commit758e2a7ee201ea2cdd446d2353437d2b4b03fb7d (patch)
treed9c386fd7ead46ca78a2ebeffd8c454dc72f0479
parent74fd151adc918a8688a09838f883a08008da3e88 (diff)
downloadPaper-758e2a7ee201ea2cdd446d2353437d2b4b03fb7d.tar.gz
Paper-758e2a7ee201ea2cdd446d2353437d2b4b03fb7d.zip
Fix bad ticking checks for blocks
Caused blocks to tick outside of simulation distance
-rw-r--r--patches/server/0437-Optimize-ServerLevels-chunk-level-checking-methods.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0437-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0437-Optimize-ServerLevels-chunk-level-checking-methods.patch
index de7b0077aa..256818f978 100644
--- a/patches/server/0437-Optimize-ServerLevels-chunk-level-checking-methods.patch
+++ b/patches/server/0437-Optimize-ServerLevels-chunk-level-checking-methods.patch
@@ -8,7 +8,7 @@ so inline where possible, and avoid the abstraction of the
Either class.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3d4961418f3ee7e2d421738d8a8104aac09361d6..fe572c99263a44a23e2dc5141295d98973684a88 100644
+index 3fea7315ed3caf7363dd9349f8e977282dfa4c07..00d5060e2a81a7c5fe32f8b9ed8334ff844a70f5 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2139,15 +2139,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18,7 +18,7 @@ index 3d4961418f3ee7e2d421738d8a8104aac09361d6..fe572c99263a44a23e2dc5141295d989
- return this.areEntitiesLoaded(chunkPos) && this.chunkSource.isPositionTicking(chunkPos);
+ // Paper start - optimize is ticking ready type functions
+ ChunkHolder chunkHolder = this.chunkSource.chunkMap.getVisibleChunkIfPresent(chunkPos);
-+ return chunkHolder != null && chunkHolder.isTickingReady() && this.areEntitiesLoaded(chunkPos);
++ return chunkHolder != null && this.chunkSource.isPositionTicking(chunkPos) && chunkHolder.isTickingReady() && this.areEntitiesLoaded(chunkPos);
+ // Paper end
}