diff --git a/patches/server/0850-Fix-int-overflow-in-chunk-range-check.patch b/patches/server/0850-Fix-int-overflow-in-chunk-range-check.patch
new file mode 100644
index 0000000000..6e689d97f1
--- /dev/null
+++ b/patches/server/0850-Fix-int-overflow-in-chunk-range-check.patch
@@ -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;
+