twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-02 13:12:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't create region files for chunk checks - mistake on upstream merge

Browse Source 
Accidently handled a conflict wrong in a previous upstream merge and set wrong param.
This commit is contained in:
Aikar
2020-05-08 18:22:37 -04:00
parent 1404a3b655
commit 8c7b991317
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch
View File

@@ -2973,6 +2973,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public NibbleArray b() { public NibbleArray b() {
return this.a == null ? new NibbleArray() : new NibbleArray((byte[]) this.a.clone()); 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<PacketListenerPlayIn> {
@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 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PlayerChunk.java --- a/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -3613,7 +3633,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public NBTTagCompound read(ChunkCoordIntPair chunkcoordintpair) throws IOException { 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 // 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, true);
+ RegionFile regionfile = this.getFile(chunkcoordintpair, false, true); // Paper + RegionFile regionfile = this.getFile(chunkcoordintpair, true, true); // Paper
if (regionfile == null) { if (regionfile == null) {
return null; return null;
} }