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

Fixes entry event and messaging when teleporting from another world 

https://github.com/BentoBoxWorld/BentoBox/issues/911
This commit is contained in:
tastybento 2019-08-21 21:19:52 -07:00
parent a0e1382875
commit 6808e755d0
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListener.java
View File

@ -36,8 +36,8 @@ public class EnterExitListener extends FlagListener {
}
private void handleEnterExit(@NonNull User user, @NonNull Location from, @NonNull Location to) {
// Only process we are in the right world and there is a change in X or Z coords
if (!getIWM().inWorld(from) || from.toVector().multiply(XZ).equals(to.toVector().multiply(XZ))) {
// Only process if there is a change in X or Z coords
if (from.getWorld().equals(to.getWorld()) && from.toVector().multiply(XZ).equals(to.toVector().multiply(XZ))) {
return;
}
@ -100,7 +100,7 @@ public class EnterExitListener extends FlagListener {
if (island.getOwner() != null) {
// Leave messages are always specific to this world
user.notify(island.getWorld(), "protection.flags.ENTER_EXIT_MESSAGES.now-leaving", TextVariables.NAME, (island.getName() != null) ? island.getName() :
user.getTranslation(island.getWorld(), "protection.flags.ENTER_EXIT_MESSAGES.island", TextVariables.NAME, getPlugin().getPlayers().getName(island.getOwner())));
user.getTranslation(island.getWorld(), "protection.flags.ENTER_EXIT_MESSAGES.island", TextVariables.NAME, getPlugin().getPlayers().getName(island.getOwner())));
}
// Send message if island is unowned, but has a name
else if (island.getName() != null) {
@ -124,7 +124,7 @@ public class EnterExitListener extends FlagListener {
if (island.getOwner() != null) {
// Leave messages are always specific to this world
user.notify(island.getWorld(), "protection.flags.ENTER_EXIT_MESSAGES.now-entering", TextVariables.NAME, (island.getName() != null) ? island.getName() :
user.getTranslation(island.getWorld(), "protection.flags.ENTER_EXIT_MESSAGES.island", TextVariables.NAME, getPlugin().getPlayers().getName(island.getOwner())));
user.getTranslation(island.getWorld(), "protection.flags.ENTER_EXIT_MESSAGES.island", TextVariables.NAME, getPlugin().getPlayers().getName(island.getOwner())));
}
// Send message if island is unowned, but has a name
else if (island.getName() != null) {

42
src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/EnterExitListenerTest.java
View File

@ -23,10 +23,12 @@ import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.plugin.PluginManager;
import org.bukkit.util.Vector;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.stubbing.Answer;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@ -68,13 +70,18 @@ public class EnterExitListenerTest {
private Location outside;
@Mock
private Location inside;
private EnterExitListener listener;
@Mock
private Location anotherWorld;
@Mock
private LocalesManager lm;
@Mock
private World world;
@Mock
private PluginManager pim;
@Mock
private Notifier notifier;
private EnterExitListener listener;
/**
* @throws java.lang.Exception
@ -111,15 +118,14 @@ public class EnterExitListenerTest {
// Locales
when(plugin.getLocalesManager()).thenReturn(lm);
when(lm.get(any(), any())).thenReturn("mock translation");
when(lm.get(any(), any())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(1, String.class));
// Placeholders
PlaceholdersManager placeholdersManager = mock(PlaceholdersManager.class);
when(plugin.getPlaceholdersManager()).thenReturn(placeholdersManager);
when(placeholdersManager.replacePlaceholders(any(), any())).thenReturn("mock translation");
when(placeholdersManager.replacePlaceholders(any(), any())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(1, String.class));
// Notifier
Notifier notifier = mock(Notifier.class);
when(plugin.getNotifier()).thenReturn(notifier);
// Island initialization
@ -154,6 +160,13 @@ public class EnterExitListenerTest {
when(inside.getBlockZ()).thenReturn(Z);
when(inside.toVector()).thenReturn(new Vector(X + PROTECTION_RANGE -2, Y, Z));
// Same as inside, but another world
when(anotherWorld.getWorld()).thenReturn(mock(World.class));
when(anotherWorld.getBlockX()).thenReturn(X + PROTECTION_RANGE - 1);
when(anotherWorld.getBlockY()).thenReturn(Y);
when(anotherWorld.getBlockZ()).thenReturn(Z);
when(anotherWorld.toVector()).thenReturn(new Vector(X + PROTECTION_RANGE - 1, Y, Z));
Optional<Island> opIsland = Optional.ofNullable(island);
when(im.getProtectedIslandAt(eq(inside))).thenReturn(opIsland);
when(im.getProtectedIslandAt(eq(inside2))).thenReturn(opIsland);
@ -189,6 +202,11 @@ public class EnterExitListenerTest {
Flags.ENTER_EXIT_MESSAGES.setSetting(world, true);
}
@After
public void tearDown() {
User.clearUsers();
}
/**
* Test method for {@link EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}.
*/
@ -197,7 +215,7 @@ public class EnterExitListenerTest {
PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), inside, inside);
listener.onMove(e);
// Moving in the island should result in no messages to the user
verify(user, never()).sendMessage(any());
verify(notifier, never()).notify(any(), any());
verify(pim, never()).callEvent(any(IslandEnterEvent.class));
verify(pim, never()).callEvent(any(IslandExitEvent.class));
}
@ -210,7 +228,7 @@ public class EnterExitListenerTest {
PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), outside, outside);
listener.onMove(e);
// Moving outside the island should result in no messages to the user
verify(user, never()).sendMessage(any());
verify(notifier, never()).notify(any(), any());
verify(pim, never()).callEvent(any(IslandEnterEvent.class));
verify(pim, never()).callEvent(any(IslandExitEvent.class));
}
@ -229,6 +247,7 @@ public class EnterExitListenerTest {
verify(island).getOwner();
verify(pim).callEvent(any(IslandEnterEvent.class));
verify(pim, never()).callEvent(any(IslandExitEvent.class));
verify(notifier).notify(any(User.class), eq("protection.flags.ENTER_EXIT_MESSAGES.now-entering"));
}
/**
@ -246,6 +265,7 @@ public class EnterExitListenerTest {
verify(island, times(2)).getName();
verify(pim).callEvent(any(IslandEnterEvent.class));
verify(pim, never()).callEvent(any(IslandExitEvent.class));
verify(notifier).notify(any(User.class), eq("protection.flags.ENTER_EXIT_MESSAGES.now-entering"));
}
/**
@ -262,6 +282,7 @@ public class EnterExitListenerTest {
verify(island).getOwner();
verify(pim).callEvent(any(IslandExitEvent.class));
verify(pim, never()).callEvent(any(IslandEnterEvent.class));
verify(notifier).notify(any(User.class), eq("protection.flags.ENTER_EXIT_MESSAGES.now-leaving"));
}
/**
@ -279,6 +300,7 @@ public class EnterExitListenerTest {
verify(island, times(2)).getName();
verify(pim).callEvent(any(IslandExitEvent.class));
verify(pim, never()).callEvent(any(IslandEnterEvent.class));
verify(notifier).notify(any(User.class), eq("protection.flags.ENTER_EXIT_MESSAGES.now-leaving"));
}
/**
@ -293,7 +315,7 @@ public class EnterExitListenerTest {
PlayerMoveEvent e = new PlayerMoveEvent(user.getPlayer(), inside, outside);
listener.onMove(e);
// No messages should be sent
verify(user, never()).sendMessage(any());
verify(notifier, never()).notify(any(), any());
// Still send event
verify(pim).callEvent(any(IslandExitEvent.class));
verify(pim, never()).callEvent(any(IslandEnterEvent.class));
@ -304,8 +326,9 @@ public class EnterExitListenerTest {
*/
@Test
public void testEnterIslandTeleport() {
PlayerTeleportEvent e = new PlayerTeleportEvent(user.getPlayer(), outside, inside, TeleportCause.PLUGIN);
PlayerTeleportEvent e = new PlayerTeleportEvent(user.getPlayer(), anotherWorld, inside, TeleportCause.PLUGIN);
listener.onTeleport(e);
verify(notifier).notify(any(User.class), eq("protection.flags.ENTER_EXIT_MESSAGES.now-entering"));
verify(pim).callEvent(any(IslandEnterEvent.class));
verify(pim, never()).callEvent(any(IslandExitEvent.class));
}
@ -315,8 +338,9 @@ public class EnterExitListenerTest {
*/
@Test
public void testExitIslandTeleport() {
PlayerTeleportEvent e = new PlayerTeleportEvent(user.getPlayer(), inside, outside, TeleportCause.PLUGIN);
PlayerTeleportEvent e = new PlayerTeleportEvent(user.getPlayer(), inside, anotherWorld, TeleportCause.PLUGIN);
listener.onTeleport(e);
verify(notifier).notify(any(User.class), eq("protection.flags.ENTER_EXIT_MESSAGES.now-leaving"));
verify(pim, never()).callEvent(any(IslandEnterEvent.class));
verify(pim).callEvent(any(IslandExitEvent.class));
}