diff --git a/pom.xml b/pom.xml
index 11d9f6c0b..8d63e8bb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
         <spigot.version>1.20.5-R0.1-SNAPSHOT</spigot.version>
         <!-- Might differ from the last Spigot release for short periods 
             of time -->
-        <paper.version>1.20.5-R0.1-SNAPSHOT</paper.version>
+        <paper.version>1.20.6-R0.1-SNAPSHOT</paper.version>
         <bstats.version>3.0.0</bstats.version>
         <vault.version>1.7.1</vault.version>
         <placeholderapi.version>2.10.9</placeholderapi.version>
diff --git a/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java
index 0a846fad4..75a0f23db 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java
@@ -84,7 +84,7 @@ public class DeathListenerTest {
         // Test
         DeathListener dl = new DeathListener(plugin);
 
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, new ArrayList<>(), 0, 0, 0, 0, "died");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, new ArrayList<>(), 0, 0, 0, 0, "died");
         dl.onPlayerDeath(e);
         Mockito.verify(pm).addDeath(world, uuid);
     }
@@ -95,7 +95,7 @@ public class DeathListenerTest {
         // Test
         DeathListener dl = new DeathListener(plugin);
 
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, new ArrayList<>(), 0, 0, 0, 0, "died");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, new ArrayList<>(), 0, 0, 0, 0, "died");
         dl.onPlayerDeath(e);
         Mockito.verify(pm, Mockito.never()).addDeath(world, uuid);
     }
@@ -106,7 +106,7 @@ public class DeathListenerTest {
         // Test
         DeathListener dl = new DeathListener(plugin);
 
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, new ArrayList<>(), 0, 0, 0, 0, "died");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, new ArrayList<>(), 0, 0, 0, 0, "died");
         dl.onPlayerDeath(e);
         Mockito.verify(pm, Mockito.never()).addDeath(world, uuid);
     }
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
index 8baa36cfc..39bbad98f 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
@@ -145,7 +145,7 @@ public class IslandRespawnListenerTest {
     public void testOnPlayerDeathNotIslandWorld() {
         when(iwm.inWorld(any(World.class))).thenReturn(false);
         List<ItemStack> drops = new ArrayList<>();
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
         new IslandRespawnListener().onPlayerDeath(e);
         verify(world, never()).getUID();
     }
@@ -158,7 +158,7 @@ public class IslandRespawnListenerTest {
     public void testOnPlayerDeathNoFlag() {
         Flags.ISLAND_RESPAWN.setSetting(world, false);
         List<ItemStack> drops = new ArrayList<>();
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
         new IslandRespawnListener().onPlayerDeath(e);
         verify(world, never()).getUID();
     }
@@ -171,7 +171,7 @@ public class IslandRespawnListenerTest {
         when(im.hasIsland(any(), any(UUID.class))).thenReturn(false);
         when(im.inTeam(any(), any(UUID.class))).thenReturn(false);
         List<ItemStack> drops = new ArrayList<>();
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
         new IslandRespawnListener().onPlayerDeath(e);
         verify(world, never()).getUID();
     }
@@ -184,7 +184,7 @@ public class IslandRespawnListenerTest {
         when(im.hasIsland(any(), any(UUID.class))).thenReturn(false);
         when(im.inTeam(any(), any(UUID.class))).thenReturn(true);
         List<ItemStack> drops = new ArrayList<>();
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
         new IslandRespawnListener().onPlayerDeath(e);
         verify(world).getUID();
     }
@@ -197,7 +197,7 @@ public class IslandRespawnListenerTest {
         when(im.hasIsland(any(), any(UUID.class))).thenReturn(true);
         when(im.inTeam(any(), any(UUID.class))).thenReturn(false);
         List<ItemStack> drops = new ArrayList<>();
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
         new IslandRespawnListener().onPlayerDeath(e);
         verify(world).getUID();
     }
@@ -209,7 +209,7 @@ public class IslandRespawnListenerTest {
     @Test
     public void testOnPlayerDeath() {
         List<ItemStack> drops = new ArrayList<>();
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
         new IslandRespawnListener().onPlayerDeath(e);
         verify(world).getUID();
     }
@@ -222,7 +222,7 @@ public class IslandRespawnListenerTest {
     public void testOnPlayerRespawn() {
         // Die
         List<ItemStack> drops = new ArrayList<>();
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
         IslandRespawnListener l = new IslandRespawnListener();
         l.onPlayerDeath(e);
         Location location = mock(Location.class);
@@ -264,7 +264,7 @@ public class IslandRespawnListenerTest {
         when(iwm.inWorld(any(Location.class))).thenReturn(false);
         // Die
         List<ItemStack> drops = new ArrayList<>();
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
         IslandRespawnListener l = new IslandRespawnListener();
         l.onPlayerDeath(e);
         Location location = mock(Location.class);
@@ -286,7 +286,7 @@ public class IslandRespawnListenerTest {
         Flags.ISLAND_RESPAWN.setSetting(world, false);
         // Die
         List<ItemStack> drops = new ArrayList<>();
-        PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
+        PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
         IslandRespawnListener l = new IslandRespawnListener();
         l.onPlayerDeath(e);
         Location location = mock(Location.class);
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java
index 4fdfa8840..9d67d68a9 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java
@@ -134,7 +134,7 @@ public class VisitorKeepInventoryListenerTest {
         // Default death event
         List<ItemStack> drops = new ArrayList<>();
         drops.add(new ItemStack(Material.ACACIA_BOAT));
-        e = new PlayerDeathEvent(player, null, drops, 100, 0, 0, 0, "Death message");
+        e = new PlayerDeathEvent(player, drops, 100, 0, 0, 0, "Death message");
         // Make new
         l = new VisitorKeepInventoryListener();
     }