mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-02 16:37:56 +02:00
ce270e1412
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: b2f1908c SPIGOT-5783: Add helpful info to UnknownDependencyException e4f46260 SPIGOT-2623: Add EntityEquipment methods to get/set ItemStacks by slot. 529a9a69 SPIGOT-5751: Clarify behaviour of block drop-related API methods CraftBukkit Changes:8ea9b138Remove outdated build delay.ffc2b251Revert "#675: Fix redirected CommandNodes sometimes not being properly redirected"cb701f6b#675: Fix redirected CommandNodes sometimes not being properly redirectedc9d7c16bSPIGOT-2623: Add EntityEquipment methods to get/set ItemStacks by slot.fad2494a#673: Fix Craftworld#isChunkLoaded8637ec00SPIGOT-5751: Made breakNaturally and getDrops returns the correct item if no argument is given Spigot Changes: a99063f7 Rebuild patches Fixes #3602
30 lines
1.6 KiB
Diff
30 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 985f54067073909f413a0c9bb574017bf6d177f3..1ba0f43702b6c576fa9251bef574b7d52406f2f1 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldChunkManagerTheEnd.java
|
|
@@ -36,7 +36,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);
|
|
|