mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 16:18:02 +01:00
928bcc8d3a
Upstream has released updates that appear 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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
29 lines
1.6 KiB
Diff
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 EndIslandDensityFunction 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.
|
|
|
|
This issue is being tracked in Mojira ticket MC-159283
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
|
|
index 30b6c5839b0da1aea792b7e092f0fcf5e83835db..683474cd96d3a0cdfb3b22d0111c8d3231f01d92 100644
|
|
--- a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
|
|
+++ b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
|
|
@@ -501,7 +501,7 @@ public final class DensityFunctions {
|
|
int j = z / 2;
|
|
int k = x % 2;
|
|
int l = z % 2;
|
|
- float f = 100.0F - Mth.sqrt((float)(x * x + z * z)) * 8.0F;
|
|
+ float f = 100.0F - Mth.sqrt((long) x * (long) x + (long) z * (long) z) * 8.0F; // Paper - cast ints to long to avoid integer overflow
|
|
f = Mth.clamp(f, -100.0F, 80.0F);
|
|
|
|
for(int m = -12; m <= 12; ++m) {
|