diff --git a/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
index 6bb1de434a..32b8ff4cf6 100644
--- a/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7bd7aa0d94..ba6d5b7ff5 100644
+index 7bd7aa0d94..5d9bed3f19 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 {
@@ -45,7 +45,7 @@ index 7bd7aa0d94..ba6d5b7ff5 100644
 +        REGEN, DELETE, NOTHING, WARN
 +    }
 +    public DuplicateUUIDMode duplicateUUIDMode = DuplicateUUIDMode.REGEN;
-+    public void repairDuplicateUUID() {
++    private void repairDuplicateUUID() {
 +        String desiredMode = getString("duplicate-uuid-resolver", "regenerate").toLowerCase().trim();
 +        switch (desiredMode.toLowerCase()) {
 +            case "regen":
@@ -78,7 +78,7 @@ index 7bd7aa0d94..ba6d5b7ff5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3ac115ff65..4728ded917 100644
+index 3ac115ff65..ba2aeb432d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@
@@ -114,15 +114,16 @@ index 3ac115ff65..4728ded917 100644
              List entityslice = aentityslice[j]; // Spigot
 +            // Paper start
 +            DuplicateUUIDMode mode = world.paperConfig.duplicateUUIDMode;
-+            if (mode == DuplicateUUIDMode.DELETE || mode == DuplicateUUIDMode.REGEN) {
++            if (mode == DuplicateUUIDMode.WARN | mode == DuplicateUUIDMode.DELETE || mode == DuplicateUUIDMode.REGEN) {
 +                Map<UUID, Entity> thisChunk = new HashMap<>();
 +                for (Iterator<Entity> iterator = ((List<Entity>) entityslice).iterator(); iterator.hasNext(); ) {
 +                    Entity entity = iterator.next();
++                    if (entity.dead) continue;
 +                    Entity other = ((WorldServer) world).entitiesByUUID.get(entity.uniqueID);
-+                    if (other == null) {
++                    if (other == null || other.dead || world.getEntityUnloadQueue().contains(other)) {
 +                        other = thisChunk.get(entity.uniqueID);
 +                    }
-+                    if (other != null) {
++                    if (other != null && !other.dead) {
 +                        switch (mode) {
 +                            case REGEN: {
 +                                entity.setUUID(UUID.randomUUID());
@@ -135,6 +136,9 @@ index 3ac115ff65..4728ded917 100644
 +                                iterator.remove();
 +                                break;
 +                            }
++                            default:
++                                logger.warn("[DUPE-UUID] Duplicate UUID found used by " + other + ", doing nothing to " + entity + ". See https://github.com/PaperMC/Paper/issues/1223 for discussion on what this is about.");
++                                break;
 +                        }
 +                    }
 +                    thisChunk.put(entity.uniqueID, entity);
@@ -156,6 +160,19 @@ index 4ea52f9c59..2217ca9737 100644
      public void a(UUID uuid) {
          this.uniqueID = uuid;
          this.au = this.uniqueID.toString();
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index 127dcedc97..5ee7cdc79c 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
+         }
+     };
+     // Spigot end
+-    protected final Set<Entity> g = Sets.newHashSet(); // Paper
++    protected final Set<Entity> g = Sets.newHashSet(); public Set<Entity> getEntityUnloadQueue() { return g; };// Paper - OBFHELPER
+     //public final List<TileEntity> tileEntityList = Lists.newArrayList(); // Paper - remove unused list
+     public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
+     private final List<TileEntity> c = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
 index 747d99dbe6..7a9f28421b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
diff --git a/Spigot-Server-Patches/Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/Prevent-Saving-Bad-entities-to-chunks.patch
index c9e8609a3f..1b7b657d9e 100644
--- a/Spigot-Server-Patches/Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/Prevent-Saving-Bad-entities-to-chunks.patch
@@ -17,24 +17,6 @@ an invalid entity.
 
 This should reduce log occurrences of dupe uuid messages.
 
-diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 56a74c6062..fd1e53febb 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 {
-                 Map<UUID, Entity> thisChunk = new HashMap<>();
-                 for (Iterator<Entity> iterator = ((List<Entity>) entityslice).iterator(); iterator.hasNext(); ) {
-                     Entity entity = iterator.next();
-+                    if (entity.dead) continue;
-                     Entity other = ((WorldServer) world).entitiesByUUID.get(entity.uniqueID);
-                     if (other == null) {
-                         other = thisChunk.get(entity.uniqueID);
-                     }
--                    if (other != null) {
-+                    if (other != null && !other.dead) {
-                         switch (mode) {
-                             case REGEN: {
-                                 entity.setUUID(UUID.randomUUID());
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 index a97e024ec4..bd52bf6561 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -75,7 +57,7 @@ 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 6d80e55c19..27398806d3 100644
+index a66770e241..1f58042125 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