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

Fix PVPListenerTest

Browse Source 
Visitors are no longer invincible when on a PVP island.
This commit is contained in:
tastybento 2021-09-04 15:12:26 -07:00
parent 7d7882c309
commit e77a40f0cb
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/test/java/world/bentobox/bentobox/listeners/flags/settings/PVPListenerTest.java
View File

@ -303,6 +303,8 @@ public class PVPListenerTest {
when(world.getEnvironment()).thenReturn(World.Environment.NORMAL); when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
when(damager.getWorld()).thenReturn(world); when(damager.getWorld()).thenReturn(world);
when(damagee.getWorld()).thenReturn(world); when(damagee.getWorld()).thenReturn(world);
when(damager.getLocation()).thenReturn(loc);
when(damagee.getLocation()).thenReturn(loc);
EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK, EntityDamageByEntityEvent e = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK,
new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)), new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, 0D)),
new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0)))); new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, Functions.constant(-0.0))));
@ -337,7 +339,8 @@ public class PVPListenerTest {
when(world.getEnvironment()).thenReturn(World.Environment.NORMAL); when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
when(damager.getWorld()).thenReturn(world); when(damager.getWorld()).thenReturn(world);
when(damagee.getWorld()).thenReturn(world); when(damagee.getWorld()).thenReturn(world);
when(damager.getLocation()).thenReturn(loc);
when(damagee.getLocation()).thenReturn(loc);
// Protect visitors // Protect visitors
List<String> visitorProtectionList = new ArrayList<>(); List<String> visitorProtectionList = new ArrayList<>();
visitorProtectionList.add("ENTITY_ATTACK"); visitorProtectionList.add("ENTITY_ATTACK");
@ -367,7 +370,8 @@ public class PVPListenerTest {
Entity damagee = mock(Player.class); Entity damagee = mock(Player.class);
when(damager.getWorld()).thenReturn(world); when(damager.getWorld()).thenReturn(world);
when(damagee.getWorld()).thenReturn(world); when(damagee.getWorld()).thenReturn(world);
when(damager.getLocation()).thenReturn(loc);
when(damagee.getLocation()).thenReturn(loc);
// Protect visitors // Protect visitors
when(iwm.getIvSettings(world)).thenReturn(Collections.singletonList("ENTITY_ATTACK")); when(iwm.getIvSettings(world)).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
// This player is a visitor // This player is a visitor
@ -391,7 +395,8 @@ public class PVPListenerTest {
when(world.getEnvironment()).thenReturn(World.Environment.NORMAL); when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
when(damager.getWorld()).thenReturn(world); when(damager.getWorld()).thenReturn(world);
when(damagee.getWorld()).thenReturn(world); when(damagee.getWorld()).thenReturn(world);
when(damager.getLocation()).thenReturn(loc);
when(damagee.getLocation()).thenReturn(loc);
// Protect visitors // Protect visitors
List<String> visitorProtectionList = new ArrayList<>(); List<String> visitorProtectionList = new ArrayList<>();
visitorProtectionList.add("ENTITY_ATTACK"); visitorProtectionList.add("ENTITY_ATTACK");
@ -418,7 +423,8 @@ public class PVPListenerTest {
when(world.getEnvironment()).thenReturn(World.Environment.NORMAL); when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
when(damager.getWorld()).thenReturn(world); when(damager.getWorld()).thenReturn(world);
when(damagee.getWorld()).thenReturn(world); when(damagee.getWorld()).thenReturn(world);
when(damager.getLocation()).thenReturn(loc);
when(damagee.getLocation()).thenReturn(loc);
// Protect visitors // Protect visitors
List<String> visitorProtectionList = new ArrayList<>(); List<String> visitorProtectionList = new ArrayList<>();
visitorProtectionList.add("ENTITY_ATTACK"); visitorProtectionList.add("ENTITY_ATTACK");
@ -448,7 +454,8 @@ public class PVPListenerTest {
when(world.getEnvironment()).thenReturn(World.Environment.NORMAL); when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
when(damager.getWorld()).thenReturn(world); when(damager.getWorld()).thenReturn(world);
when(damagee.getWorld()).thenReturn(world); when(damagee.getWorld()).thenReturn(world);
when(damager.getLocation()).thenReturn(loc);
when(damagee.getLocation()).thenReturn(loc);
// This player is a visitor // This player is a visitor
when(im.userIsOnIsland(any(), any())).thenReturn(false); when(im.userIsOnIsland(any(), any())).thenReturn(false);
@ -532,9 +539,8 @@ public class PVPListenerTest {
when(im.userIsOnIsland(any(), any())).thenReturn(false); when(im.userIsOnIsland(any(), any())).thenReturn(false);
when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK")); when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
new PVPListener().onEntityDamage(e); new PVPListener().onEntityDamage(e);
// visitor should be protected // visitor should not be protected
assertTrue(e.isCancelled()); assertFalse(e.isCancelled());
verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
} }
@ -606,9 +612,8 @@ public class PVPListenerTest {
when(im.userIsOnIsland(any(), any())).thenReturn(false); when(im.userIsOnIsland(any(), any())).thenReturn(false);
when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK")); when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
new PVPListener().onEntityDamage(e); new PVPListener().onEntityDamage(e);
// visitor should be protected // visitor should not be protected
assertTrue(e.isCancelled()); assertFalse(e.isCancelled());
verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
} }
@ -723,9 +728,8 @@ public class PVPListenerTest {
when(im.userIsOnIsland(any(), any())).thenReturn(false); when(im.userIsOnIsland(any(), any())).thenReturn(false);
when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK")); when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
new PVPListener().onFishing(pfe); new PVPListener().onFishing(pfe);
// visitor should be protected // visitor should not be protected
assertTrue(pfe.isCancelled()); assertFalse(pfe.isCancelled());
verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
} }
/** /**
@ -785,10 +789,13 @@ public class PVPListenerTest {
ThrownPotion tp = mock(ThrownPotion.class); ThrownPotion tp = mock(ThrownPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
// Create a damage map // Create a damage map
Map<LivingEntity, Double> map = new HashMap<>(); Map<LivingEntity, Double> map = new HashMap<>();
map.put(zombie, 100D); map.put(zombie, 100D);
map.put(creeper, 10D); map.put(creeper, 10D);
when(zombie.getLocation()).thenReturn(loc);
when(creeper.getLocation()).thenReturn(loc);
PotionSplashEvent e = new PotionSplashEvent(tp, map); PotionSplashEvent e = new PotionSplashEvent(tp, map);
new PVPListener().onSplashPotionSplash(e); new PVPListener().onSplashPotionSplash(e);
assertFalse(e.isCancelled()); assertFalse(e.isCancelled());
@ -805,6 +812,7 @@ public class PVPListenerTest {
ThrownPotion tp = mock(ThrownPotion.class); ThrownPotion tp = mock(ThrownPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
// Create a damage map // Create a damage map
Map<LivingEntity, Double> map = new HashMap<>(); Map<LivingEntity, Double> map = new HashMap<>();
map.put(player2, 100D); map.put(player2, 100D);
@ -835,6 +843,7 @@ public class PVPListenerTest {
ThrownPotion tp = mock(ThrownPotion.class); ThrownPotion tp = mock(ThrownPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
// Create a damage map // Create a damage map
Map<LivingEntity, Double> map = new HashMap<>(); Map<LivingEntity, Double> map = new HashMap<>();
map.put(player, 100D); map.put(player, 100D);
@ -862,6 +871,7 @@ public class PVPListenerTest {
ThrownPotion tp = mock(ThrownPotion.class); ThrownPotion tp = mock(ThrownPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
// Create a damage map // Create a damage map
Map<LivingEntity, Double> map = new HashMap<>(); Map<LivingEntity, Double> map = new HashMap<>();
map.put(player2, 100D); map.put(player2, 100D);
@ -887,6 +897,7 @@ public class PVPListenerTest {
ThrownPotion tp = mock(ThrownPotion.class); ThrownPotion tp = mock(ThrownPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
// Create a damage map // Create a damage map
Map<LivingEntity, Double> map = new HashMap<>(); Map<LivingEntity, Double> map = new HashMap<>();
map.put(player2, 100D); map.put(player2, 100D);
@ -898,11 +909,10 @@ public class PVPListenerTest {
when(im.userIsOnIsland(any(), any())).thenReturn(false); when(im.userIsOnIsland(any(), any())).thenReturn(false);
when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK")); when(iwm.getIvSettings(any())).thenReturn(Collections.singletonList("ENTITY_ATTACK"));
new PVPListener().onSplashPotionSplash(e); new PVPListener().onSplashPotionSplash(e);
// visitor should be protected // visitor should not be protected
assertFalse(e.getAffectedEntities().contains(player2)); assertTrue(e.getAffectedEntities().contains(player2));
assertTrue(e.getAffectedEntities().contains(zombie)); assertTrue(e.getAffectedEntities().contains(zombie));
assertTrue(e.getAffectedEntities().contains(creeper)); assertTrue(e.getAffectedEntities().contains(creeper));
verify(notifier).notify(any(), eq(Flags.INVINCIBLE_VISITORS.getHintReference()));
// Wrong world // Wrong world
wrongWorld(); wrongWorld();
@ -919,6 +929,7 @@ public class PVPListenerTest {
LingeringPotion tp = mock(LingeringPotion.class); LingeringPotion tp = mock(LingeringPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
AreaEffectCloud cloud = mock(AreaEffectCloud.class); AreaEffectCloud cloud = mock(AreaEffectCloud.class);
LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud); LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud);
new PVPListener().onLingeringPotionSplash(e); new PVPListener().onLingeringPotionSplash(e);
@ -938,6 +949,7 @@ public class PVPListenerTest {
LingeringPotion tp = mock(LingeringPotion.class); LingeringPotion tp = mock(LingeringPotion.class);
when(tp.getShooter()).thenReturn(creeper); when(tp.getShooter()).thenReturn(creeper);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
AreaEffectCloud cloud = mock(AreaEffectCloud.class); AreaEffectCloud cloud = mock(AreaEffectCloud.class);
LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud); LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud);
new PVPListener().onLingeringPotionSplash(e); new PVPListener().onLingeringPotionSplash(e);
@ -959,6 +971,7 @@ public class PVPListenerTest {
LingeringPotion tp = mock(LingeringPotion.class); LingeringPotion tp = mock(LingeringPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
AreaEffectCloud cloud = mock(AreaEffectCloud.class); AreaEffectCloud cloud = mock(AreaEffectCloud.class);
when(cloud.getWorld()).thenReturn(world); when(cloud.getWorld()).thenReturn(world);
LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud); LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud);
@ -995,6 +1008,7 @@ public class PVPListenerTest {
LingeringPotion tp = mock(LingeringPotion.class); LingeringPotion tp = mock(LingeringPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
AreaEffectCloud cloud = mock(AreaEffectCloud.class); AreaEffectCloud cloud = mock(AreaEffectCloud.class);
when(cloud.getWorld()).thenReturn(world); when(cloud.getWorld()).thenReturn(world);
LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud); LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud);
@ -1029,6 +1043,7 @@ public class PVPListenerTest {
LingeringPotion tp = mock(LingeringPotion.class); LingeringPotion tp = mock(LingeringPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
AreaEffectCloud cloud = mock(AreaEffectCloud.class); AreaEffectCloud cloud = mock(AreaEffectCloud.class);
when(cloud.getWorld()).thenReturn(world); when(cloud.getWorld()).thenReturn(world);
LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud); LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud);
@ -1069,6 +1084,7 @@ public class PVPListenerTest {
LingeringPotion tp = mock(LingeringPotion.class); LingeringPotion tp = mock(LingeringPotion.class);
when(tp.getShooter()).thenReturn(player); when(tp.getShooter()).thenReturn(player);
when(tp.getWorld()).thenReturn(world); when(tp.getWorld()).thenReturn(world);
when(tp.getLocation()).thenReturn(loc);
AreaEffectCloud cloud = mock(AreaEffectCloud.class); AreaEffectCloud cloud = mock(AreaEffectCloud.class);
when(cloud.getWorld()).thenReturn(world); when(cloud.getWorld()).thenReturn(world);
LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud); LingeringPotionSplashEvent e = new LingeringPotionSplashEvent(tp, cloud);