Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-21 18:25:12 +01:00
Code Issues Projects Releases Wiki Activity

Back to 1.20.6

Browse Source
This commit is contained in:
tastybento 2024-05-12 17:20:14 -07:00
parent f4780659e3
commit f536a13c59
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -76,7 +76,7 @@
<spigot.version>1.20.5-R0.1-SNAPSHOT</spigot.version> <spigot.version>1.20.5-R0.1-SNAPSHOT</spigot.version>
<!-- Might differ from the last Spigot release for short periods <!-- Might differ from the last Spigot release for short periods
of time --> 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> <bstats.version>3.0.0</bstats.version>
<vault.version>1.7.1</vault.version> <vault.version>1.7.1</vault.version>
<placeholderapi.version>2.10.9</placeholderapi.version> <placeholderapi.version>2.10.9</placeholderapi.version>

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

@ -84,7 +84,7 @@ public class DeathListenerTest {
// Test // Test
DeathListener dl = new DeathListener(plugin); 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); dl.onPlayerDeath(e);
Mockito.verify(pm).addDeath(world, uuid); Mockito.verify(pm).addDeath(world, uuid);
} }
@ -95,7 +95,7 @@ public class DeathListenerTest {
// Test // Test
DeathListener dl = new DeathListener(plugin); 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); dl.onPlayerDeath(e);
Mockito.verify(pm, Mockito.never()).addDeath(world, uuid); Mockito.verify(pm, Mockito.never()).addDeath(world, uuid);
} }
@ -106,7 +106,7 @@ public class DeathListenerTest {
// Test // Test
DeathListener dl = new DeathListener(plugin); 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); dl.onPlayerDeath(e);
Mockito.verify(pm, Mockito.never()).addDeath(world, uuid); Mockito.verify(pm, Mockito.never()).addDeath(world, uuid);
} }

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

@ -145,7 +145,7 @@ public class IslandRespawnListenerTest {
public void testOnPlayerDeathNotIslandWorld() { public void testOnPlayerDeathNotIslandWorld() {
when(iwm.inWorld(any(World.class))).thenReturn(false); when(iwm.inWorld(any(World.class))).thenReturn(false);
List<ItemStack> drops = new ArrayList<>(); 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); new IslandRespawnListener().onPlayerDeath(e);
verify(world, never()).getUID(); verify(world, never()).getUID();
} }
@ -158,7 +158,7 @@ public class IslandRespawnListenerTest {
public void testOnPlayerDeathNoFlag() { public void testOnPlayerDeathNoFlag() {
Flags.ISLAND_RESPAWN.setSetting(world, false); Flags.ISLAND_RESPAWN.setSetting(world, false);
List<ItemStack> drops = new ArrayList<>(); 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); new IslandRespawnListener().onPlayerDeath(e);
verify(world, never()).getUID(); verify(world, never()).getUID();
} }
@ -171,7 +171,7 @@ public class IslandRespawnListenerTest {
when(im.hasIsland(any(), any(UUID.class))).thenReturn(false); when(im.hasIsland(any(), any(UUID.class))).thenReturn(false);
when(im.inTeam(any(), any(UUID.class))).thenReturn(false); when(im.inTeam(any(), any(UUID.class))).thenReturn(false);
List<ItemStack> drops = new ArrayList<>(); 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); new IslandRespawnListener().onPlayerDeath(e);
verify(world, never()).getUID(); verify(world, never()).getUID();
} }
@ -184,7 +184,7 @@ public class IslandRespawnListenerTest {
when(im.hasIsland(any(), any(UUID.class))).thenReturn(false); when(im.hasIsland(any(), any(UUID.class))).thenReturn(false);
when(im.inTeam(any(), any(UUID.class))).thenReturn(true); when(im.inTeam(any(), any(UUID.class))).thenReturn(true);
List<ItemStack> drops = new ArrayList<>(); 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); new IslandRespawnListener().onPlayerDeath(e);
verify(world).getUID(); verify(world).getUID();
} }
@ -197,7 +197,7 @@ public class IslandRespawnListenerTest {
when(im.hasIsland(any(), any(UUID.class))).thenReturn(true); when(im.hasIsland(any(), any(UUID.class))).thenReturn(true);
when(im.inTeam(any(), any(UUID.class))).thenReturn(false); when(im.inTeam(any(), any(UUID.class))).thenReturn(false);
List<ItemStack> drops = new ArrayList<>(); 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); new IslandRespawnListener().onPlayerDeath(e);
verify(world).getUID(); verify(world).getUID();
} }
@ -209,7 +209,7 @@ public class IslandRespawnListenerTest {
@Test @Test
public void testOnPlayerDeath() { public void testOnPlayerDeath() {
List<ItemStack> drops = new ArrayList<>(); 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); new IslandRespawnListener().onPlayerDeath(e);
verify(world).getUID(); verify(world).getUID();
} }
@ -222,7 +222,7 @@ public class IslandRespawnListenerTest {
public void testOnPlayerRespawn() { public void testOnPlayerRespawn() {
// Die // Die
List<ItemStack> drops = new ArrayList<>(); 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(); IslandRespawnListener l = new IslandRespawnListener();
l.onPlayerDeath(e); l.onPlayerDeath(e);
Location location = mock(Location.class); Location location = mock(Location.class);
@ -264,7 +264,7 @@ public class IslandRespawnListenerTest {
when(iwm.inWorld(any(Location.class))).thenReturn(false); when(iwm.inWorld(any(Location.class))).thenReturn(false);
// Die // Die
List<ItemStack> drops = new ArrayList<>(); 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(); IslandRespawnListener l = new IslandRespawnListener();
l.onPlayerDeath(e); l.onPlayerDeath(e);
Location location = mock(Location.class); Location location = mock(Location.class);
@ -286,7 +286,7 @@ public class IslandRespawnListenerTest {
Flags.ISLAND_RESPAWN.setSetting(world, false); Flags.ISLAND_RESPAWN.setSetting(world, false);
// Die // Die
List<ItemStack> drops = new ArrayList<>(); 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(); IslandRespawnListener l = new IslandRespawnListener();
l.onPlayerDeath(e); l.onPlayerDeath(e);
Location location = mock(Location.class); Location location = mock(Location.class);

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

@ -134,7 +134,7 @@ public class VisitorKeepInventoryListenerTest {
// Default death event // Default death event
List<ItemStack> drops = new ArrayList<>(); List<ItemStack> drops = new ArrayList<>();
drops.add(new ItemStack(Material.ACACIA_BOAT)); 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 // Make new
l = new VisitorKeepInventoryListener(); l = new VisitorKeepInventoryListener();
} }