2018-10-21 23:16:54 +00:00
|
|
|
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
|
2018-09-29 05:22:21 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 29 Sep 2018 01:18:16 -0400
|
|
|
|
Subject: [PATCH] Fix Sending Chunks to Client
|
|
|
|
|
|
|
|
Vanilla has some screwy logic that doesn't send a chunk until
|
|
|
|
it has been post processed. This is an issue as post processing
|
|
|
|
doesn't occur until all neighbor chunks have been loaded.
|
|
|
|
|
|
|
|
This can reduce view distance while generating terrain, but also
|
|
|
|
cause bugs where chunks are never sent to the client.
|
|
|
|
|
|
|
|
This fix always sends chunks to the client, and simply updates
|
|
|
|
the client anytime post processing is triggered with the new chunk data.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
2018-10-21 23:16:54 +00:00
|
|
|
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
2018-09-29 05:22:21 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
2018-10-07 18:58:53 +00:00
|
|
|
@@ -1205,7 +1205,7 @@ public class Chunk implements IChunkAccess {
|
2018-09-29 05:22:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean isReady() {
|
|
|
|
- return this.C.a(ChunkStatus.POSTPROCESSED);
|
|
|
|
+ return true; // Paper - Always send chunks
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean v() {
|
2018-10-07 18:58:53 +00:00
|
|
|
@@ -1471,6 +1471,13 @@ public class Chunk implements IChunkAccess {
|
2018-10-02 13:06:52 +00:00
|
|
|
this.h.clear();
|
2018-09-29 05:22:21 +00:00
|
|
|
this.a(ChunkStatus.POSTPROCESSED);
|
|
|
|
this.m.a(this);
|
|
|
|
+ // Paper start - resend chunk after post process
|
|
|
|
+ PlayerChunk playerChunk = ((WorldServer) world).getPlayerChunkMap().getChunk(locX, locZ);
|
|
|
|
+ if (playerChunk != null) {
|
|
|
|
+ playerChunk.done = false;
|
|
|
|
+ playerChunk.sendAll();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
|
2018-10-21 23:16:54 +00:00
|
|
|
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
2018-09-29 05:22:21 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
|
|
|
|
@@ -23,7 +23,7 @@ public class PlayerChunk {
|
|
|
|
private int dirtyCount;
|
|
|
|
private int h;
|
|
|
|
private long i;
|
|
|
|
- private boolean done;
|
|
|
|
+ boolean done; // Paper - package-private
|
|
|
|
|
|
|
|
// CraftBukkit start - add fields
|
|
|
|
// You know the drill, https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/browse
|
2018-10-21 23:16:54 +00:00
|
|
|
@@ -155,6 +155,7 @@ public class PlayerChunk {
|
2018-09-29 05:22:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public boolean sendAll() { return b(); } // Paper - OBFHELPER
|
|
|
|
public boolean b() {
|
|
|
|
if (this.done) {
|
|
|
|
return true;
|
|
|
|
--
|
2018-10-21 23:16:54 +00:00
|
|
|
2.18.0
|
2018-09-29 05:22:21 +00:00
|
|
|
|