65 lines
3.5 KiB
Diff
65 lines
3.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||
|
|
Date: Thu, 16 Apr 2020 16:13:59 -0700
|
||
|
|
Subject: [PATCH] Optimize ServerLevels chunk level checking methods
|
||
|
|
|
||
|
|
These can be hot functions (i.e entity ticking and block ticking),
|
||
|
|
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 7e1062df9c2fd2d9be82fb84b7b93eb6fa207e57..3327fb07840e6dc6d2249b05a403f52ccd531b0f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
@@ -2073,15 +2073,18 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
public boolean isPositionTickingWithEntitiesLoaded(BlockPos blockposition) {
|
||
|
|
long i = ChunkPos.asLong(blockposition);
|
||
|
|
|
||
|
|
- return this.chunkSource.isPositionTicking(i) && this.areEntitiesLoaded(i);
|
||
|
|
+ // Paper start - optimize is ticking ready type functions
|
||
|
|
+ ChunkHolder chunkHolder = this.chunkSource.chunkMap.getVisibleChunkIfPresent(i);
|
||
|
|
+ return chunkHolder != null && chunkHolder.isTickingReady() && this.areEntitiesLoaded(i);
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
|
||
|
|
public boolean isPositionEntityTicking(BlockPos blockposition) {
|
||
|
|
- return this.entityManager.isPositionTicking(blockposition);
|
||
|
|
+ return this.entityManager.isPositionTicking(ChunkPos.asLong(blockposition)); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
public boolean isPositionEntityTicking(ChunkPos chunkcoordintpair) {
|
||
|
|
- return this.entityManager.isPositionTicking(chunkcoordintpair);
|
||
|
|
+ return this.entityManager.isPositionTicking(chunkcoordintpair.toLong()); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
private final class EntityCallbacks implements LevelCallback<Entity> {
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/ChunkPos.java b/src/main/java/net/minecraft/world/level/ChunkPos.java
|
||
|
|
index 439f82a48e6f6ce7b4773505ced32324cacb302d..2a99aa989ac5c19d99bb3cbc0934425e46573cd7 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/ChunkPos.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/ChunkPos.java
|
||
|
|
@@ -48,7 +48,7 @@ public class ChunkPos {
|
||
|
|
}
|
||
|
|
|
||
|
|
public static long asLong(BlockPos blockPos) {
|
||
|
|
- return asLong(SectionPos.blockToSectionCoord(blockPos.getX()), SectionPos.blockToSectionCoord(blockPos.getZ()));
|
||
|
|
+ return (((long)blockPos.getX() >> 4) & 4294967295L) | ((((long)blockPos.getZ() >> 4) & 4294967295L) << 32); // Paper - inline
|
||
|
|
}
|
||
|
|
|
||
|
|
public static int getX(long pos) {
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
|
||
|
|
index 624fd443d2cc71605cfff996140b00f37c8d8841..e94b5a7fe47831e2c3e0935e316737a2422e4250 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
|
||
|
|
@@ -326,6 +326,11 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
|
||
|
|
public LevelEntityGetter<T> getEntityGetter() {
|
||
|
|
return this.entityGetter;
|
||
|
|
}
|
||
|
|
+ // Paper start
|
||
|
|
+ public final boolean isPositionTicking(long position) {
|
||
|
|
+ return this.chunkVisibility.get(position).isTicking();
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
public boolean isPositionTicking(BlockPos blockPos) {
|
||
|
|
return this.chunkVisibility.get(ChunkPos.asLong(blockPos)).isTicking();
|