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

Fixes issue with hostile mobs not being removed on teleport

Browse Source 
https://github.com/BentoBoxWorld/BentoBox/issues/818
This commit is contained in:
tastybento 2019-07-06 13:42:25 -07:00
parent e9ca8733c0
commit 6634a4e1f5
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/RemoveMobsListener.java
View File

@ -1,5 +1,6 @@
package world.bentobox.bentobox.listeners.flags.worldsettings;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerTeleportEvent;
@ -18,7 +19,7 @@ public class RemoveMobsListener extends FlagListener {
public void onUserTeleport(PlayerTeleportEvent e) {
// Only process if flag is active
if (getIslands().locationIsOnIsland(e.getPlayer(), e.getTo()) && Flags.REMOVE_MOBS.isSetForWorld(e.getTo().getWorld())) {
getIslands().clearArea(e.getTo());
Bukkit.getScheduler().runTask(getPlugin(), () -> getIslands().clearArea(e.getTo()));
}
}
}

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

@ -5,19 +5,23 @@ package world.bentobox.bentobox.listeners.flags.worldsettings;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.any;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.scheduler.BukkitScheduler;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
@ -37,13 +41,15 @@ import world.bentobox.bentobox.util.Util;
*
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest({BentoBox.class, Util.class })
@PrepareForTest({BentoBox.class, Util.class, Bukkit.class })
public class RemoveMobsListenerTest {
private IslandsManager im;
private World world;
private Location inside;
private Player player;
@Mock
private BukkitScheduler scheduler;
/**
* @throws java.lang.Exception
@ -93,6 +99,10 @@ public class RemoveMobsListenerTest {
UUID uuid = UUID.randomUUID();
when(player.getUniqueId()).thenReturn(uuid);
// Scheduler
PowerMockito.mockStatic(Bukkit.class);
when(Bukkit.getScheduler()).thenReturn(scheduler);
}
/**
@ -102,7 +112,7 @@ public class RemoveMobsListenerTest {
public void testOnUserTeleport() {
PlayerTeleportEvent e = new PlayerTeleportEvent(player, inside, inside, PlayerTeleportEvent.TeleportCause.PLUGIN);
new RemoveMobsListener().onUserTeleport(e);
Mockito.verify(im).clearArea(Mockito.any());
Mockito.verify(scheduler).runTask(any(), any(Runnable.class));
}
/**
@ -113,7 +123,7 @@ public class RemoveMobsListenerTest {
Flags.REMOVE_MOBS.setSetting(world, false);
PlayerTeleportEvent e = new PlayerTeleportEvent(player, inside, inside, PlayerTeleportEvent.TeleportCause.PLUGIN);
new RemoveMobsListener().onUserTeleport(e);
Mockito.verify(im, Mockito.never()).clearArea(Mockito.any());
Mockito.verify(scheduler, Mockito.never()).runTask(any(), any(Runnable.class));
}
/**
@ -125,7 +135,7 @@ public class RemoveMobsListenerTest {
when(im.locationIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
PlayerTeleportEvent e = new PlayerTeleportEvent(player, inside, inside, PlayerTeleportEvent.TeleportCause.PLUGIN);
new RemoveMobsListener().onUserTeleport(e);
Mockito.verify(im, Mockito.never()).clearArea(Mockito.any());
Mockito.verify(scheduler, Mockito.never()).runTask(any(), any(Runnable.class));
}
}