From f6fc0d4cd4345d30d2e6eeeb728eae6a34b35db5 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. --- ...90-Asynchronous-chunk-IO-and-loading.patch | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch index 7015a28cab..99252250c4 100644 --- a/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch @@ -2973,6 +2973,26 @@ index ed8c4a87b52e6375e354a28316f8f24608082417..996c8326387b5a7fe62db6a76e000144 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 4c52c57c02571353f71772e3650932f314da62ca..631106920cdca4162b2e039e631d86a4c1b92ce1 100644 +--- a/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java ++++ b/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java +@@ -12,13 +12,13 @@ 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 040d4b41ea2223937ca22de2d40560f97b310f9a..bf592125f4ce5d7ea6e802e637ee3bfbe25d23aa 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java @@ -3553,7 +3573,7 @@ index d37abf2cf304f81405e570588c8accbc44a629f4..df728e2c0a2bf660a91e0bd6342c4b4b } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 2f8af42e2aadeb1b11db94fdb54ec0ba9e30f095..2b9bf25fbb04c542472627dd12d54d0671813412 100644 +index 2f8af42e2aadeb1b11db94fdb54ec0ba9e30f095..72118a7dcfabde0f069b8c8b86f41c026a2c99d9 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -9,7 +9,7 @@ import java.io.File; @@ -3613,7 +3633,7 @@ index 2f8af42e2aadeb1b11db94fdb54ec0ba9e30f095..2b9bf25fbb04c542472627dd12d54d06 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; }