Merge branch 'master' into pre/1.13

* master:
  make dupe uuid saferegen delete range configurable
  Entity add to world fixes - #1223

Spigot-Server-Patches/Prevent-Saving-Bad-entities-to-chunks.patch

@@ -56,30 +56,4 @@ index a97e024ec4..bd52bf6561 100644
  
          nbttagcompound.set("Entities", nbttaglist1);
          NBTTagList nbttaglist2 = new NBTTagList();
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3c9d9f1ab0..0f2dadfa39 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
-             }
- 
-             this.getChunkAt(i, j).a(entity);
--            this.entityList.add(entity);
-+            if (!entity.dead) this.entityList.add(entity); // Paper - don't add dead entities, chunk registration may of killed it
-             this.b(entity);
-             return true;
-         }
-diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7a9f28421b..b57e1ff364 100644
---- a/src/main/java/net/minecraft/server/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-             if (this.entitiesByUUID.containsKey(uuid)) {
-                 Entity entity1 = (Entity) this.entitiesByUUID.get(uuid);
- 
--                if (this.g.contains(entity1)) {
-+                if (this.g.contains(entity1) || entity1.dead) { // Paper - overwrite the current dead one
-                     this.g.remove(entity1);
-                 } else {
-                     if (!(entity instanceof EntityHuman)) {
 --