mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
66 lines
3.2 KiB
Diff
66 lines
3.2 KiB
Diff
|
From 9f57d53bd92a3c87603dc929b6490a8501a18c0d 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 ChunkProviderServer's chunk level checking helper
|
||
|
|
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/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||
|
|
index f741a034e..664a244dd 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||
|
|
@@ -534,27 +534,37 @@ public class ChunkProviderServer extends IChunkProvider {
|
||
|
|
|
||
|
|
public final boolean isInEntityTickingChunk(Entity entity) { return this.a(entity); } // Paper - OBFHELPER
|
||
|
|
@Override public boolean a(Entity entity) {
|
||
|
|
- long i = ChunkCoordIntPair.pair(MathHelper.floor(entity.locX()) >> 4, MathHelper.floor(entity.locZ()) >> 4);
|
||
|
|
-
|
||
|
|
- return this.a(i, PlayerChunk::b);
|
||
|
|
+ // Paper start - optimize is ticking ready type functions
|
||
|
|
+ // entity ticking
|
||
|
|
+ PlayerChunk playerChunk = this.getChunk(MCUtil.getCoordinateKey(entity));
|
||
|
|
+ return playerChunk != null && playerChunk.isEntityTickingReady();
|
||
|
|
+ // Paper end - optimize is ticking ready type functions
|
||
|
|
}
|
||
|
|
|
||
|
|
public final boolean isEntityTickingChunk(ChunkCoordIntPair chunkcoordintpair) { return this.a(chunkcoordintpair); } // Paper - OBFHELPER
|
||
|
|
@Override public boolean a(ChunkCoordIntPair chunkcoordintpair) {
|
||
|
|
- return this.a(chunkcoordintpair.pair(), PlayerChunk::b);
|
||
|
|
+ // Paper start - optimize is ticking ready type functions
|
||
|
|
+ // is entity ticking ready
|
||
|
|
+ PlayerChunk playerChunk = this.getChunk(MCUtil.getCoordinateKey(chunkcoordintpair));
|
||
|
|
+ return playerChunk != null && playerChunk.isEntityTickingReady();
|
||
|
|
+ // Paper end - optimize is ticking ready type functions
|
||
|
|
}
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public boolean a(BlockPosition blockposition) {
|
||
|
|
- long i = ChunkCoordIntPair.pair(blockposition.getX() >> 4, blockposition.getZ() >> 4);
|
||
|
|
-
|
||
|
|
- return this.a(i, PlayerChunk::a);
|
||
|
|
+ // Paper start - optimize is ticking ready type functions
|
||
|
|
+ // is ticking ready
|
||
|
|
+ PlayerChunk playerChunk = this.getChunk(MCUtil.getCoordinateKey(blockposition));
|
||
|
|
+ return playerChunk != null && playerChunk.isTickingReady();
|
||
|
|
+ // Paper end - optimize is ticking ready type functions
|
||
|
|
}
|
||
|
|
|
||
|
|
public boolean b(Entity entity) {
|
||
|
|
- long i = ChunkCoordIntPair.pair(MathHelper.floor(entity.locX()) >> 4, MathHelper.floor(entity.locZ()) >> 4);
|
||
|
|
-
|
||
|
|
- return this.a(i, PlayerChunk::c);
|
||
|
|
+ // Paper start - optimize is ticking ready type functions
|
||
|
|
+ // is full chunk ready
|
||
|
|
+ PlayerChunk playerChunk = this.getChunk(MCUtil.getCoordinateKey(entity));
|
||
|
|
+ return playerChunk != null && playerChunk.isFullChunkReady();
|
||
|
|
+ // Paper end - optimize is ticking ready type functions
|
||
|
|
}
|
||
|
|
|
||
|
|
private boolean a(long i, Function<PlayerChunk, CompletableFuture<Either<Chunk, PlayerChunk.Failure>>> function) {
|
||
|
|
--
|
||
|
|
2.26.0
|
||
|
|
|