core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0139-Chunk-registration-fix...

35 lines
1.5 KiB
Diff
Raw Normal View History

Merge branch 'master' into pre/1.13 * master: Always process chunk registration after moving Always move Entity to its new Chunk even if unloaded If Entity is added to chunk, look up the chunk if current isnt set Ignore Dead Entities in entityList iteration Always process chunk removal in removeEntity
2018-07-29 17:12:39 +00:00
From c77ae6f712e3d8402a0aafe3e543cae5b24754d9 Mon Sep 17 00:00:00 2001
add a chunk registration fix World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is treated Keep them consistent
2016-09-22 02:56:19 +00:00
From: Aikar <aikar@aikar.co>
Date: Wed, 21 Sep 2016 22:54:28 -0400
Subject: [PATCH] Chunk registration fixes
World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is treated
Keep them consistent
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
Merge branch 'master' into pre/1.13 * master: Always process chunk registration after moving Always move Entity to its new Chunk even if unloaded If Entity is added to chunk, look up the chunk if current isnt set Ignore Dead Entities in entityList iteration Always process chunk removal in removeEntity
2018-07-29 17:12:39 +00:00
index e74b53c48..01041ede9 100644
add a chunk registration fix World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is treated Keep them consistent
2016-09-22 02:56:19 +00:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
update upstream
2018-07-29 16:42:07 +00:00
@@ -1485,7 +1485,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
Update Paper to MC 1.12-pre5
2017-05-21 04:41:39 +00:00
}
add a chunk registration fix World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is treated Keep them consistent
2016-09-22 02:56:19 +00:00
Update to 1.12-pre6
2017-05-31 08:04:52 +00:00
i = MathHelper.floor(entity.locX / 16.0D);
- j = MathHelper.floor(entity.locY / 16.0D);
+ j = Math.min(15, Math.max(0, MathHelper.floor(entity.locY / 16.0D))); // Paper - stay consistent with chunk add/remove behavior
Update Paper to MC 1.12-pre5
2017-05-21 04:41:39 +00:00
int k = MathHelper.floor(entity.locZ / 16.0D);
add a chunk registration fix World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is treated Keep them consistent
2016-09-22 02:56:19 +00:00
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
if (!entity.inChunk || entity.ae != i || entity.af != j || entity.ag != k) {
Merge branch 'master' into pre/1.13 * master: Always process chunk registration after moving Always move Entity to its new Chunk even if unloaded If Entity is added to chunk, look up the chunk if current isnt set Ignore Dead Entities in entityList iteration Always process chunk removal in removeEntity
2018-07-29 17:12:39 +00:00
@@ -1493,7 +1493,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
this.getChunkAt(entity.ae, entity.ag).a(entity, entity.af);
Always move Entity to its new Chunk even if unloaded Vanilla logic here would allow us to remvoe an entity from its current chunk, and if it was going to move into an unloaded chunk, that entity would not be added to the unloaded chunk. This is bad because this will result in the entity being lost! In almost all cases, the chunk will be loaded, but in the event it wasn't, instead of losing the entity, load the chunk to add the entity to it.
2018-07-29 16:06:35 +00:00
}
Merge branch 'master' into pre/1.13 * master: Always process chunk registration after moving Always move Entity to its new Chunk even if unloaded If Entity is added to chunk, look up the chunk if current isnt set Ignore Dead Entities in entityList iteration Always process chunk removal in removeEntity
2018-07-29 17:12:39 +00:00
- if (!entity.bN() && !this.isChunkLoaded(i, k, true)) {
+ if (false && !entity.bN() && !this.isChunkLoaded(i, k, true)) { // Paper - Always send entities into a new chunk, never lose them
entity.inChunk = false;
Always move Entity to its new Chunk even if unloaded Vanilla logic here would allow us to remvoe an entity from its current chunk, and if it was going to move into an unloaded chunk, that entity would not be added to the unloaded chunk. This is bad because this will result in the entity being lost! In almost all cases, the chunk will be loaded, but in the event it wasn't, instead of losing the entity, load the chunk to add the entity to it.
2018-07-29 16:06:35 +00:00
} else {
this.getChunkAt(i, k).a(entity);
add a chunk registration fix World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is treated Keep them consistent
2016-09-22 02:56:19 +00:00
--
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 07:55:24 +00:00
2.18.0
add a chunk registration fix World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is treated Keep them consistent
2016-09-22 02:56:19 +00:00