diff --git a/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
index 4337118156..966da269ac 100644
--- a/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
@@ -81,7 +81,7 @@ index ef882b897..385b3ac0c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4d96e4fb1..26cf42a45 100644
+index 292365607..6e435d77f 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 {
@@ -105,7 +105,7 @@ index d02e48a86..3b1555dd2 100644
          this.uniqueID = uuid;
          this.ap = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 1cf516192..292fa782d 100644
+index 1cf516192..31fe5f5e6 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -0,0 +0,0 @@
@@ -155,7 +155,7 @@ index 1cf516192..292fa782d 100644
 +                                        && entity.getBukkitEntity().getLocation().distance(other.getBukkitEntity().getLocation()) < world.paperConfig.duplicateUUIDDeleteRange
 +                                ) {
 +                                    if (World.DEBUG_ENTITIES) LOGGER.warn("[DUPE-UUID] Duplicate UUID found used by " + other + ", deleted entity " + entity + " because it was near the duplicate and likely an actual duplicate. See https://github.com/PaperMC/Paper/issues/1223 for discussion on what this is about.");
-+                                    entity.die();
++                                    entity.dead = true;
 +                                    iterator.remove();
 +                                    continue;
 +                                }
@@ -168,7 +168,7 @@ index 1cf516192..292fa782d 100644
 +                                        }
 +                                        case DELETE: {
 +                                            if (World.DEBUG_ENTITIES) LOGGER.warn("[DUPE-UUID] Duplicate UUID found used by " + other + ", deleted entity " + entity + ". See https://github.com/PaperMC/Paper/issues/1223 for discussion on what this is about.");
-+                                            entity.die();
++                                            entity.dead = true;
 +                                            iterator.remove();
 +                                            break;
 +                                        }
diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index 4184f65c29..33b16ddcaa 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -322,14 +322,14 @@ index afa9f0c1e..85a5776b0 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 937fcd7fa..b317a9800 100644
+index 937fcd7fa..d62c84516 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 {
              server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(this.bukkitChunk, this.needsDecoration));
  
              if (this.needsDecoration) {
-+                this.world.timings.syncChunkLoadPopulateTimer.startTiming(); // Paper
++            try (co.aikar.timings.Timing ignored = this.world.timings.syncChunkLoadPopulateTimer.startTiming()) { // Paper
                  java.util.Random random = new java.util.Random();
                  random.setSeed(world.getSeed());
                  long xRand = random.nextLong() / 2L * 2L + 1L;
@@ -337,7 +337,7 @@ index 937fcd7fa..b317a9800 100644
                      }
                  }
                  server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
-+                this.world.timings.syncChunkLoadPopulateTimer.stopTiming(); // Paper
++                } // Paper
              }
          }
      }
@@ -624,7 +624,7 @@ index 1a33b7048..7c72fb918 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 25972072f..581ecf71d 100644
+index 64318e6e7..c76620f2b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@
diff --git a/Spigot-Server-Patches/fixup-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/fixup-Duplicate-UUID-Resolve-Option.patch
deleted file mode 100644
index 0fb7f3f632..0000000000
--- a/Spigot-Server-Patches/fixup-Duplicate-UUID-Resolve-Option.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 19 May 2019 20:46:35 +0100
-Subject: [PATCH] fixup! Duplicate UUID Resolve Option
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 292fa782d..31fe5f5e6 100644
---- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
-+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -0,0 +0,0 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
-                                         && entity.getBukkitEntity().getLocation().distance(other.getBukkitEntity().getLocation()) < world.paperConfig.duplicateUUIDDeleteRange
-                                 ) {
-                                     if (World.DEBUG_ENTITIES) LOGGER.warn("[DUPE-UUID] Duplicate UUID found used by " + other + ", deleted entity " + entity + " because it was near the duplicate and likely an actual duplicate. See https://github.com/PaperMC/Paper/issues/1223 for discussion on what this is about.");
--                                    entity.die();
-+                                    entity.dead = true;
-                                     iterator.remove();
-                                     continue;
-                                 }
-@@ -0,0 +0,0 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
-                                         }
-                                         case DELETE: {
-                                             if (World.DEBUG_ENTITIES) LOGGER.warn("[DUPE-UUID] Duplicate UUID found used by " + other + ", deleted entity " + entity + ". See https://github.com/PaperMC/Paper/issues/1223 for discussion on what this is about.");
--                                            entity.die();
-+                                            entity.dead = true;
-                                             iterator.remove();
-                                             break;
-                                         }
---
\ No newline at end of file