From 8c7b99131709e938c82ffeb6ecaab6e6ee73cc4c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 8 May 2020 18:22:37 -0400 Subject: [PATCH] Don't create region files for chunk checks - mistake on upstream merge Accidently handled a conflict wrong in a previous upstream merge and set wrong param. --- .../Asynchronous-chunk-IO-and-loading.patch | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch index 4dc7306f32..8af41e1696 100644 --- a/Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch @@ -2973,6 +2973,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public NibbleArray b() { return this.a == null ? new NibbleArray() : new NibbleArray((byte[]) this.a.clone()); } +diff --git a/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java b/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java ++++ b/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java +@@ -0,0 +0,0 @@ public class PacketPlayInTabComplete implements Packet { + @Override + public void a(PacketDataSerializer packetdataserializer) throws IOException { + this.a = packetdataserializer.i(); +- this.b = packetdataserializer.e(32500); ++ this.b = packetdataserializer.e(256); + } + + @Override + public void b(PacketDataSerializer packetdataserializer) throws IOException { + packetdataserializer.d(this.a); +- packetdataserializer.a(this.b, 32500); ++ packetdataserializer.a(this.b, 256); + } + + public void a(PacketListenerPlayIn packetlistenerplayin) { diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java @@ -3613,7 +3633,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public NBTTagCompound read(ChunkCoordIntPair chunkcoordintpair) throws IOException { // CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing - RegionFile regionfile = this.getFile(chunkcoordintpair, true); -+ RegionFile regionfile = this.getFile(chunkcoordintpair, false, true); // Paper ++ RegionFile regionfile = this.getFile(chunkcoordintpair, true, true); // Paper if (regionfile == null) { return null; }