63 lines
3.8 KiB
Diff
63 lines
3.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||
|
|
Date: Mon, 8 Jul 2019 00:13:36 -0700
|
||
|
|
Subject: [PATCH] Use getChunkIfLoadedImmediately in places
|
||
|
|
|
||
|
|
This prevents us from hitting chunk loads for chunks at or less-than
|
||
|
|
ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
|
||
|
|
load in that case).
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
index 87b3eee23441717660aa6bb81248986cb7ef2fb4..8154ca39ec7e2e8559cd125d73a59b8d2b00714c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
@@ -206,7 +206,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
}
|
||
|
|
|
||
|
|
@Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
|
||
|
|
- return this.chunkSource.getChunk(x, z, false);
|
||
|
|
+ return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
// Paper start - Asynchronous IO
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
index 8708eb173fbb17cf84a0c6d9a42623750472f650..35fa416a8ce332e823ed5077a8fd3492683d7ad0 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
@@ -1318,7 +1318,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||
|
|
speed = this.player.getAbilities().walkingSpeed * 10f;
|
||
|
|
}
|
||
|
|
// Paper start - Prevent moving into unloaded chunks
|
||
|
|
- if (player.level.paperConfig.preventMovingIntoUnloadedChunks && (this.player.getX() != toX || this.player.getZ() != toZ) && !worldserver.hasChunk((int) Math.floor(toX) >> 4, (int) Math.floor(toZ) >> 4)) {
|
||
|
|
+ if (player.level.paperConfig.preventMovingIntoUnloadedChunks && (this.player.getX() != toX || this.player.getZ() != toZ) && worldserver.getChunkIfLoadedImmediately((int) Math.floor(toX) >> 4, (int) Math.floor(toZ) >> 4) == null) { // Paper - use getIfLoadedImmediately
|
||
|
|
this.internalTeleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot(), Collections.emptySet(), true);
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||
|
|
index 1c171599dbde44389013dc08ca8263742d58d721..17281575ff83bbf1e720335619a78a6d0a0e5077 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||
|
|
@@ -191,6 +191,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||
|
|
return (CraftServer) Bukkit.getServer();
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ @Override
|
||
|
|
+ public boolean hasChunk(int chunkX, int chunkZ) {
|
||
|
|
+ return ((ServerLevel) this).getChunkIfLoaded(chunkX, chunkZ) != null;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
public ResourceKey<DimensionType> getTypeKey() {
|
||
|
|
return this.typeKey;
|
||
|
|
}
|
||
|
|
@@ -1366,7 +1373,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||
|
|
|
||
|
|
for (int l1 = j; l1 <= l; ++l1) {
|
||
|
|
for (int i2 = k; i2 <= i1; ++i2) {
|
||
|
|
- LevelChunk chunk = this.getChunkSource().getChunkNow(l1, i2);
|
||
|
|
+ LevelChunk chunk = (LevelChunk) this.getChunkIfLoadedImmediately(l1, i2); // Paper
|
||
|
|
|
||
|
|
if (chunk != null) {
|
||
|
|
for (int j2 = j1; j2 <= k1; ++j2) {
|