PaperMC/Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch
Gabscap 7ae47d4eb3
[CI-SKIP] Remove Waving banner fix (#4786)
Mojang fixed it in MC-63720
2020-11-19 10:15:16 -05:00

29 lines
1.6 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Slovikosky <davidslovikosky@gmail.com>
Date: Tue, 9 Jun 2020 00:10:03 -0700
Subject: [PATCH] Fix missing chunks due to integer overflow
This patch fixes a bug in the WorldChunkManagerTheEnd class where the distance
from 0,0 squared overflows the maximum size of an integer. The overflow leads
to hard chunk borders around 370,000 blocks from 0,0. After this cutoff there
is a few hundred thousand block gap before end land resuming to generate at
530,000 blocks from spawn. This is due to the integer flipping back and forth.
The fix for the issue is quite simple, casting chunk coordinates to longs
allows the distance calculation to avoid overflow and work as intended.
diff --git a/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java b/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java
index 844ad0fbdc6e2f9aee1d25fe21dcdf53eb28d559..9c15cd303ccc2928be4e3e7080e74e8314d7e0f2 100644
--- a/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java
+++ b/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java
@@ -70,7 +70,9 @@ public class WorldChunkManagerTheEnd extends WorldChunkManager {
int l = j / 2;
int i1 = i % 2;
int j1 = j % 2;
- float f = 100.0F - MathHelper.c((float) (i * i + j * j)) * 8.0F;
+ // Paper start - cast ints to long to avoid integer overflow
+ float f = 100.0F - MathHelper.sqrt((long) i * (long) i + (long) j * (long) j) * 8.0F;
+ // Paper end
f = MathHelper.a(f, -100.0F, 80.0F);