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

26 lines
1.0 KiB
Diff
Raw Normal View History

Merge branch 'master' into pre/1.13 * master: Undo a mistaken chunk registration change - Closes #1302
2018-08-04 17:00:26 +00:00
From f73d69ae1fe48058ff0764e110a09429773ec48a 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: Undo a mistaken chunk registration change - Closes #1302
2018-08-04 17:00:26 +00:00
index e74b53c483..20e52fbcc8 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) {
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