EpicKnarvik97/Stargate
EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Fixes some nullpointerexceptions in PlayerEventsListener's onPlayerMove

Browse Source
This commit is contained in:
Kristian Knarvik 2021-02-22 20:23:12 +01:00
parent d26196b8aa
commit 279ea9d8f0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/knarcraft/stargate/listener/PlayerEventsListener.java
View File

@ -100,19 +100,23 @@ public class PlayerEventsListener implements Listener {
*/ */
@EventHandler @EventHandler
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
if (event.isCancelled()) { if (event.isCancelled() || event.getTo() == null) {
return; return;
} }
//Check to see if the player moved to another block //Check to see if the player moved to another block
BlockLocation fromLocation = (BlockLocation) event.getFrom(); BlockLocation fromLocation = new BlockLocation(event.getFrom().getBlock());
BlockLocation toLocation = (BlockLocation) event.getTo(); BlockLocation toLocation = new BlockLocation(event.getTo().getBlock());
if (toLocation == null || fromLocation.equals(toLocation)) { if (fromLocation.equals(toLocation)) {
return; return;
} }
Player player = event.getPlayer(); Player player = event.getPlayer();
Portal entrancePortal = PortalHandler.getByEntrance(toLocation); Portal entrancePortal = PortalHandler.getByEntrance(toLocation);
if (entrancePortal == null) {
return;
}
Portal destination = entrancePortal.getDestination(player); Portal destination = entrancePortal.getDestination(player);
//Decide if the anything stops the player from teleport //Decide if the anything stops the player from teleport