SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  clear current chunk and entity slice on chunk unload
This commit is contained in:
Aikar
2018-07-30 01:06:39 -04:00
parent ef22f9d531 2b23006694
commit 5fe01c2659
6 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Configurable-Chunk-Inhabited-Timer.patch
View File

@@ -9,7 +9,7 @@ aspects of vanilla gameplay to this factor.
For people who want all chunks to be treated equally, you can disable the timer.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index b3b3baddc..613964ce0 100644
index b3b3baddc0..613964ce04 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index b3b3baddc..613964ce0 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 5d1812ab0..695c6d3b7 100644
index b8e3307f36..00f55355f6 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {