Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

[Auto] Updated Upstream (Spigot)

Browse Source 
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

Spigot Changes:
2474d93d SPIGOT-4462: Catch async chunk regenerate
This commit is contained in:
Aikar
2018-11-03 05:31:30 -04:00
parent b4baf9ce4d
commit aaefc4fbbe
15 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0345-Implement-Force-Loaded-Chunk-API.patch
View File

@@ -1,11 +1,11 @@
From 6efe491434ee66156df70829d328ebdbb690c1ac Mon Sep 17 00:00:00 2001
From 15713ce4147d9658c1be331ce9a245016cb094c9 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Wed, 29 Aug 2018 00:37:42 -0400
Subject: [PATCH] Implement Force-Loaded Chunk API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 12c6d850d..b9371e3ae 100644
index 12c6d850d2..b9371e3ae9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -289,6 +289,18 @@ public class CraftChunk implements Chunk {
@@ -28,10 +28,10 @@ index 12c6d850d..b9371e3ae 100644
Arrays.fill(emptySkyLight, (byte) 0xFF);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 98efce511..13d1551bb 100644
index 4237e5e3c4..d5936eb199 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -570,6 +570,12 @@ public class CraftWorld implements World {
@@ -571,6 +571,12 @@ public class CraftWorld implements World {
return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
}