OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-22 06:55:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with 0,0 chunks causing crash

Browse source
This commit is contained in:
Aikar 2020-04-09 23:02:05 -04:00
parent 0db7fba2d3
commit 13e8f5eb83
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/Speed-up-processing-of-chunk-loads-and-generation.patch
View file

@ -46,7 +46,7 @@ index 69e26a8267..434833d50e 100644
public static final Timing connectionTimer = Timings.ofSafe("Connection Handler"); 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 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 new file mode 100644
index 0000000000..99e2041bd9 index 0000000000..e0ad725b2e
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java +++ b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@ -79,9 +79,7 @@ index 0000000000..99e2041bd9
+ this.last = map.last; + this.last = map.last;
+ this.n = map.n; + this.n = map.n;
+ this.maxFill = map.maxFill; + this.maxFill = map.maxFill;
+ if (map.containsKey(null)) { + this.containsNullKey = map.containsNullKey;
+ this.put(null, map.get(null));
+ }
+ } + }
+} +}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java