[Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
68588dac SPIGOT-4405: Chunk generation problem
This commit is contained in:
Aikar 2018-10-02 09:06:52 -04:00
parent 083bf7b255
commit 920bf4680b
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
2 changed files with 5 additions and 5 deletions

View file

@ -1,4 +1,4 @@
From e0ed2e74e4a3a027832171214b5e6fca71c42fa1 Mon Sep 17 00:00:00 2001
From 5ae13b5d368068c630d57a8d6c4801b673b31ffa Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 29 Sep 2018 01:18:16 -0400
Subject: [PATCH] Fix Sending Chunks to Client
@ -14,7 +14,7 @@ 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
index 895eb60854..350479dc68 100644
index 83df52f30..0b0a5424e 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1212,7 +1212,7 @@ public class Chunk implements IChunkAccess {
@ -27,7 +27,7 @@ index 895eb60854..350479dc68 100644
public boolean v() {
@@ -1478,6 +1478,13 @@ public class Chunk implements IChunkAccess {
com.google.common.base.Preconditions.checkState(this.h.isEmpty(), "Pending tiles not empty"); // CraftBukkit
this.h.clear();
this.a(ChunkStatus.POSTPROCESSED);
this.m.a(this);
+ // Paper start - resend chunk after post process
@ -41,7 +41,7 @@ index 895eb60854..350479dc68 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
index 04ad94e171..748d5f28e5 100644
index 04ad94e17..748d5f28e 100644
--- 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 {

@ -1 +1 @@
Subproject commit c8f68670f5d5b7d2733fbf2e50c8825c5138ba44
Subproject commit 68588dac4f57ffda02a84a9c9ed5803322fb5e71