Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 04:25:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix chunk range int overflow

Browse Source
This commit is contained in:
Nassim Jahnke 2022-01-11 19:34:25 +01:00
parent 6f0762c012
commit cb198ff936
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches/server/0850-Fix-int-overflow-in-chunk-range-check.patch Normal file
View File

@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Tue, 11 Jan 2022 19:31:46 +0100
Subject: [PATCH] Fix int overflow in chunk range check
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 16fd37a5048ee4b2fa6760c66af6f14e8fd71f89..0a04980a8015fe08907a040f0f3ff537267bd462 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -621,9 +621,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
public static boolean isChunkInRange(int x1, int z1, int x2, int z2, int distance) {
int j1 = Math.max(0, Math.abs(x1 - x2) - 1);
int k1 = Math.max(0, Math.abs(z1 - z2) - 1);
- int l1 = Math.max(0, Math.max(j1, k1) - 1);
- int i2 = Math.min(j1, k1);
- int j2 = i2 * i2 + l1 * l1;
+ // Paper start - fix integer overflow
+ long l1 = Math.max(0, Math.max(j1, k1) - 1);
+ long i2 = Math.min(j1, k1);
+ long j2 = i2 * i2 + l1 * l1;
+ // Paper end
int k2 = distance - 1;
int l2 = k2 * k2;