From 279ea9d8f0074f64455718d28c1fe09597237d3f Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Mon, 22 Feb 2021 20:23:12 +0100 Subject: [PATCH] Fixes some nullpointerexceptions in PlayerEventsListener's onPlayerMove --- .../stargate/listener/PlayerEventsListener.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/knarcraft/stargate/listener/PlayerEventsListener.java b/src/main/java/net/knarcraft/stargate/listener/PlayerEventsListener.java index 15030f1..7b36964 100644 --- a/src/main/java/net/knarcraft/stargate/listener/PlayerEventsListener.java +++ b/src/main/java/net/knarcraft/stargate/listener/PlayerEventsListener.java @@ -100,19 +100,23 @@ public class PlayerEventsListener implements Listener { */ @EventHandler public void onPlayerMove(PlayerMoveEvent event) { - if (event.isCancelled()) { + if (event.isCancelled() || event.getTo() == null) { return; } //Check to see if the player moved to another block - BlockLocation fromLocation = (BlockLocation) event.getFrom(); - BlockLocation toLocation = (BlockLocation) event.getTo(); - if (toLocation == null || fromLocation.equals(toLocation)) { + BlockLocation fromLocation = new BlockLocation(event.getFrom().getBlock()); + BlockLocation toLocation = new BlockLocation(event.getTo().getBlock()); + if (fromLocation.equals(toLocation)) { return; } Player player = event.getPlayer(); Portal entrancePortal = PortalHandler.getByEntrance(toLocation); + if (entrancePortal == null) { + return; + } + Portal destination = entrancePortal.getDestination(player); //Decide if the anything stops the player from teleport