Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-13 19:01:28 +01:00
Code Issues Projects Releases Wiki Activity

Adds null check for world in portal teleport listener

Browse Source 
This should not occur, but apparently, it can sometimes.

https://github.com/BentoBoxWorld/BentoBox/issues/583
This commit is contained in:
tastybento 2019-02-26 08:19:05 -08:00
parent b5a657de52
commit 2664acbe47
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java
View File

@ -52,7 +52,7 @@ public class PortalTeleportationListener implements Listener {
return false; return false;
} }
World fromWorld = e.getFrom().getWorld(); World fromWorld = e.getFrom().getWorld();
if (e.getCause() != TeleportCause.END_PORTAL || !plugin.getIWM().isEndGenerate(fromWorld)) { if (fromWorld == null || e.getCause() != TeleportCause.END_PORTAL || !plugin.getIWM().isEndGenerate(fromWorld)) {
// Do nothing special // Do nothing special
return false; return false;
} }

25
src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java
View File

@ -207,6 +207,31 @@ public class PortalTeleportationListenerTest {
assertFalse(e.isCancelled()); assertFalse(e.isCancelled());
} }
/**
* Test method for {@link PortalTeleportationListener#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}.
*/
@Test
public void testOnEndIslandPortalNullLocation() {
PortalTeleportationListener np = new PortalTeleportationListener(plugin);
Location loc = null;
PlayerPortalEvent e = new PlayerPortalEvent(null, loc, null, null, TeleportCause.END_PORTAL);
assertFalse(np.onEndIslandPortal(e));
assertFalse(e.isCancelled());
}
/**
* Test method for {@link PortalTeleportationListener#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}.
*/
@Test
public void testOnEndIslandPortalNullWorld() {
PortalTeleportationListener np = new PortalTeleportationListener(plugin);
Location loc = mock(Location.class);
when(loc.getWorld()).thenReturn(null);
PlayerPortalEvent e = new PlayerPortalEvent(null, loc, null, null, TeleportCause.END_PORTAL);
assertFalse(np.onEndIslandPortal(e));
assertFalse(e.isCancelled());
}
/** /**
* Test method for {@link PortalTeleportationListener#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}. * Test method for {@link PortalTeleportationListener#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}.
*/ */