From 13e8f5eb838850e0b74544698470b6e0d5dd9f18 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 9 Apr 2020 23:02:05 -0400 Subject: [PATCH] Fix issue with 0,0 chunks causing crash --- .../Speed-up-processing-of-chunk-loads-and-generation.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Spigot-Server-Patches/Speed-up-processing-of-chunk-loads-and-generation.patch b/Spigot-Server-Patches/Speed-up-processing-of-chunk-loads-and-generation.patch index 245826e035..3bae19fed3 100644 --- a/Spigot-Server-Patches/Speed-up-processing-of-chunk-loads-and-generation.patch +++ b/Spigot-Server-Patches/Speed-up-processing-of-chunk-loads-and-generation.patch @@ -46,7 +46,7 @@ index 69e26a8267..434833d50e 100644 public static final Timing connectionTimer = Timings.ofSafe("Connection Handler"); diff --git a/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java new file mode 100644 -index 0000000000..99e2041bd9 +index 0000000000..e0ad725b2e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java @@ -0,0 +0,0 @@ @@ -79,9 +79,7 @@ index 0000000000..99e2041bd9 + this.last = map.last; + this.n = map.n; + this.maxFill = map.maxFill; -+ if (map.containsKey(null)) { -+ this.put(null, map.get(null)); -+ } ++ this.containsNullKey = map.containsNullKey; + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java