mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-13 19:28:03 +01:00
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.
This commit is contained in:
parent
1404a3b655
commit
8c7b991317
1 changed files with 21 additions and 1 deletions
|
@ -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<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
|
||||
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;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue