Merge branch 'master' into pre/1.13

* master:
  make dupe uuid saferegen delete range configurable
  Entity add to world fixes - #1223
This commit is contained in:
Aikar
2018-08-04 00:33:21 -04:00
4 changed files with 94 additions and 33 deletions

View File

@@ -7,7 +7,7 @@ This disables the behavior that allows players to keep chunks permanently loaded
by default and allows server operators to enable it if they wish.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 809441fc63..4a135d84db 100644
index 37315233e1..044da2754d 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 {