Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update to latest 1.20.6 API for PlayerDeathEvent

This commit is contained in:
tastybento 2024-05-11 12:55:14 -07:00
parent d288528a17
commit 24d81da907
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/java/world/bentobox/bentobox/listeners/DeathListenerTest.java
View File

@ -10,6 +10,8 @@ import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.damage.DamageSource;
import org.bukkit.damage.DamageType;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.junit.After;
@ -39,6 +41,7 @@ public class DeathListenerTest {
private World world;
private UUID uuid;
private IslandWorldManager iwm;
private DamageSource ds = DamageSource.builder(DamageType.ARROW).build();
@Before
public void setUp() {
@ -82,7 +85,7 @@ public class DeathListenerTest {
// Test
DeathListener dl = new DeathListener(plugin);
PlayerDeathEvent e = new PlayerDeathEvent(player, new ArrayList<>(), 0, 0, 0, 0, "died");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, new ArrayList<>(), 0, 0, 0, 0, "died");
dl.onPlayerDeath(e);
Mockito.verify(pm).addDeath(world, uuid);
}
@ -93,7 +96,7 @@ public class DeathListenerTest {
// Test
DeathListener dl = new DeathListener(plugin);
PlayerDeathEvent e = new PlayerDeathEvent(player, new ArrayList<>(), 0, 0, 0, 0, "died");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, new ArrayList<>(), 0, 0, 0, 0, "died");
dl.onPlayerDeath(e);
Mockito.verify(pm, Mockito.never()).addDeath(world, uuid);
}
@ -104,7 +107,7 @@ public class DeathListenerTest {
// Test
DeathListener dl = new DeathListener(plugin);
PlayerDeathEvent e = new PlayerDeathEvent(player, new ArrayList<>(), 0, 0, 0, 0, "died");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, new ArrayList<>(), 0, 0, 0, 0, "died");
dl.onPlayerDeath(e);
Mockito.verify(pm, Mockito.never()).addDeath(world, uuid);
}

22
src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/IslandRespawnListenerTest.java
View File

@ -21,6 +21,8 @@ import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.damage.DamageSource;
import org.bukkit.damage.DamageType;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
@ -71,6 +73,8 @@ public class IslandRespawnListenerTest {
@Mock
private Island island;
private DamageSource ds = DamageSource.builder(DamageType.ARROW).build();
/**
*/
@Before
@ -142,7 +146,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, drops, 0, 0, 0, 0, "");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
new IslandRespawnListener().onPlayerDeath(e);
verify(world, never()).getUID();
}
@ -155,7 +159,7 @@ public class IslandRespawnListenerTest {
public void testOnPlayerDeathNoFlag() {
Flags.ISLAND_RESPAWN.setSetting(world, false);
List<ItemStack> drops = new ArrayList<>();
PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
new IslandRespawnListener().onPlayerDeath(e);
verify(world, never()).getUID();
}
@ -168,7 +172,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, drops, 0, 0, 0, 0, "");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
new IslandRespawnListener().onPlayerDeath(e);
verify(world, never()).getUID();
}
@ -181,7 +185,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, drops, 0, 0, 0, 0, "");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
new IslandRespawnListener().onPlayerDeath(e);
verify(world).getUID();
}
@ -194,7 +198,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, drops, 0, 0, 0, 0, "");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
new IslandRespawnListener().onPlayerDeath(e);
verify(world).getUID();
}
@ -206,7 +210,7 @@ public class IslandRespawnListenerTest {
@Test
public void testOnPlayerDeath() {
List<ItemStack> drops = new ArrayList<>();
PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
new IslandRespawnListener().onPlayerDeath(e);
verify(world).getUID();
}
@ -219,7 +223,7 @@ public class IslandRespawnListenerTest {
public void testOnPlayerRespawn() {
// Die
List<ItemStack> drops = new ArrayList<>();
PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
IslandRespawnListener l = new IslandRespawnListener();
l.onPlayerDeath(e);
Location location = mock(Location.class);
@ -261,7 +265,7 @@ public class IslandRespawnListenerTest {
when(iwm.inWorld(any(Location.class))).thenReturn(false);
// Die
List<ItemStack> drops = new ArrayList<>();
PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
IslandRespawnListener l = new IslandRespawnListener();
l.onPlayerDeath(e);
Location location = mock(Location.class);
@ -283,7 +287,7 @@ public class IslandRespawnListenerTest {
Flags.ISLAND_RESPAWN.setSetting(world, false);
// Die
List<ItemStack> drops = new ArrayList<>();
PlayerDeathEvent e = new PlayerDeathEvent(player, drops, 0, 0, 0, 0, "");
PlayerDeathEvent e = new PlayerDeathEvent(player, ds, drops, 0, 0, 0, 0, "");
IslandRespawnListener l = new IslandRespawnListener();
l.onPlayerDeath(e);
Location location = mock(Location.class);

5
src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java
View File

@ -23,6 +23,8 @@ import java.util.UUID;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.damage.DamageSource;
import org.bukkit.damage.DamageType;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.inventory.ItemStack;
@ -134,7 +136,8 @@ public class VisitorKeepInventoryListenerTest {
// Default death event
List<ItemStack> drops = new ArrayList<>();
drops.add(new ItemStack(Material.ACACIA_BOAT));
e = new PlayerDeathEvent(player, drops, 100, 0, 0, 0, "Death message");
DamageSource ds = DamageSource.builder(DamageType.ARROW).build();
e = new PlayerDeathEvent(player, ds, drops, 100, 0, 0, 0, "Death message");
// Make new
l = new VisitorKeepInventoryListener();
}