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

35 lines
1.5 KiB
Diff
Raw Normal View History

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
From 8133b92590c9b861b7342bcc1079c23f2e106450 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
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
index 6e37c4366..ea24a6e4c 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
Skip Entity and Tile Entity ticking in chunks scheduled for unload (#1132) Fixes #1131
2018-05-30 20:31:55 +00:00
@@ -1770,7 +1770,7 @@ public abstract class World implements IBlockAccess {
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
Update Paper to MC 1.12-pre5
2017-05-21 04:41:39 +00:00
if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) {
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
@@ -1778,7 +1778,7 @@ public abstract class World implements IBlockAccess {
this.getChunkAt(entity.ab, entity.ad).a(entity, entity.ac);
}
- if (!entity.bD() && !this.isChunkLoaded(i, k, true)) {
+ if (false && !entity.bD() && !this.isChunkLoaded(i, k, true)) { // Paper - Always send entities into a new chunk, never lose them
entity.aa = false;
} 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