@@ -8,7 +8,7 @@ Instead, only iterate over navigators in the current region that are
8
8
eligible for repathing.
9
9
10
10
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
11
- index 9a269f0ab59b4ea2ce01957f89677d2f304ebf02..b6a17bb19a45ccd4bfc4be5f177a792a9a3727f5 100644
11
+ index 43373e6bbe20e467043e750e0d7a11cd5a0ea1bc..952286cca1ce9e893f4a9e5939c552efe975abb4 100644
12
12
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
13
13
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
14
14
@@ -301,15 +301,81 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -110,14 +110,14 @@ index 9a269f0ab59b4ea2ce01957f89677d2f304ebf02..b6a17bb19a45ccd4bfc4be5f177a792a
110
110
}
111
111
112
112
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
113
- index ea665ae89b0963e5605ff0bc87f906fdddeb2c9a..ae1de6544f488ff14202fd9df6267b2c98b81111 100644
113
+ index ea665ae89b0963e5605ff0bc87f906fdddeb2c9a..ca9c43f48ab269430accbefe0ed470bc62efade9 100644
114
114
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
115
115
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
116
116
@@ -1096,6 +1096,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
117
117
public void tickNonPassenger(Entity entity) {
118
118
// Paper start - log detailed entity tick information
119
119
io.papermc.paper.util.TickThread.ensureTickThread("Cannot tick an entity off-main");
120
- + this.entityManager.updateNavigatorsInRegion(entity); // Paper - optimise notify
120
+ + if (!entity.isRemoved()) this.entityManager.updateNavigatorsInRegion(entity); // Paper - optimise notify
121
121
try {
122
122
if (currentlyTickingEntity.get() == null) {
123
123
currentlyTickingEntity.lazySet(entity);
0 commit comments