0f2ea04c1c
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: af58d316 Fix javadoc warning in Firework.setShotAtAngle CraftBukkit Changes:e2dd6555SPIGOT-5372: Re-add tile entity fixer due to MC-1639451e7a197fFix incorrect inequality in683bae0670db98d54dSPIGOT-5362: Suspicious stews fail isSimilar check Spigot Changes: 56f84710 Rebuild patches
46 Zeilen
2.1 KiB
Diff
46 Zeilen
2.1 KiB
Diff
From 62b6f06b1b5058350a704386051fe072e97a5b52 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 28 Sep 2018 21:49:53 -0400
|
|
Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
|
|
|
|
Vanilla has risk of losing entities by causing them to be
|
|
removed from all chunks if they try to move into an unloaded chunk.
|
|
|
|
This pretty much means high chance this entity will be lost in this
|
|
scenario.
|
|
|
|
There is another case that adding an entity to the world can fail if
|
|
the chunk isn't loaded.
|
|
|
|
Lots of the server is designed around addEntity never expecting to fail
|
|
for these reasons, nor is it really logical.
|
|
|
|
This change ensures the chunks are always loaded when entities are
|
|
added to the world, or a valid entity moves between chunks.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 408bde5ca..c31a212b4 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -672,7 +672,7 @@ public class WorldServer extends World {
|
|
this.getChunkAt(entity.chunkX, entity.chunkZ).a(entity, entity.chunkY);
|
|
}
|
|
|
|
- if (!entity.bU() && !this.isChunkLoaded(i, k)) {
|
|
+ if (!entity.valid && !entity.bU() && !this.isChunkLoaded(i, k)) { // Paper - always load chunks to register valid entities location
|
|
entity.inChunk = false;
|
|
} else {
|
|
this.getChunkAt(i, k).a(entity);
|
|
@@ -1007,7 +1007,7 @@ public class WorldServer extends World {
|
|
return false;
|
|
}
|
|
// CraftBukkit end
|
|
- IChunkAccess ichunkaccess = this.getChunkAt(MathHelper.floor(entity.locX / 16.0D), MathHelper.floor(entity.locZ / 16.0D), ChunkStatus.FULL, entity.attachedToPlayer);
|
|
+ IChunkAccess ichunkaccess = this.getChunkAt(MathHelper.floor(entity.locX / 16.0D), MathHelper.floor(entity.locZ / 16.0D), ChunkStatus.FULL, true); // Paper - always load chunks for entity adds
|
|
|
|
if (!(ichunkaccess instanceof Chunk)) {
|
|
return false;
|
|
--
|
|
2.23.0
|
|
|