Update upstream

This commit is contained in:
Aikar
2016-06-22 22:18:41 -04:00
parent 7253bb10ca
commit 03553d232e
10 changed files with 18 additions and 161 deletions

View File

@@ -89,13 +89,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
if (event.isCancelled()) {
continue;
}
+ chunk.lightingQueue.processUnload(); // Paper
if (event.isCancelled()) {
return false;
}
+ chunk.lightingQueue.processUnload(); // Paper
// Update neighbor counts
for (int x = -2; x < 3; x++) {
// Update neighbor counts
for (int x = -2; x < 3; x++) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java