diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java index 7ac0668f..75b64df6 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java @@ -43,7 +43,7 @@ public class MVPortalListener implements Listener { } MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getEntity().getWorld()); // We have to do it like this due to a bug in 1.1-R3 - if (!world.getAllowedPortals().isPortalAllowed(event.getPortalType())) { + if (world != null && !world.getAllowedPortals().isPortalAllowed(event.getPortalType())) { event.setCancelled(true); } } @@ -55,7 +55,7 @@ public class MVPortalListener implements Listener { @EventHandler(ignoreCancelled = true) public void portalForm(PortalCreateEvent event) { MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getWorld()); - if (!world.getAllowedPortals().isPortalAllowed(PortalType.NETHER)) { + if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.NETHER)) { plugin.log(Level.FINE, "Cancelling creation of nether portal because portalForm disallows."); event.setCancelled(true); } @@ -78,7 +78,7 @@ public class MVPortalListener implements Listener { return; } MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getPlayer().getWorld()); - if (!world.getAllowedPortals().isPortalAllowed(PortalType.ENDER)) { + if (world != null && !world.getAllowedPortals().isPortalAllowed(PortalType.ENDER)) { plugin.log(Level.FINE, "Cancelling creation of ender portal because portalForm disallows."); event.setCancelled(true); }