Merge pull request #3084 from Multiverse/ben/fix-getTo-null

Multiverse · Aug 13, 2024 · 2d059ea · 2d059ea
2 parents 2cf8b69 + 006fe56
commit 2d059ea
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
@@ -169,6 +169,10 @@ public void playerTeleport(PlayerTeleportEvent event) {
         if (event.isCancelled()) {
             return;
         }
+        if (event.getTo() == null) {
+            Logging.fine("Player '" + event.getPlayer().getName() + "' is teleporting to a null location!");
+            return;
+        }
         Player teleportee = event.getPlayer();
         CommandSender teleporter = teleportee;
         String teleporterName = MultiverseCore.getPlayerTeleporter(teleportee.getName());
@@ -284,6 +288,7 @@ public void playerPortal(PlayerPortalEvent event) {
         }
         // The adjust should have happened much earlier.
         if (event.getTo() == null) {
+            Logging.fine("Player '" + event.getPlayer().getName() + "' is portaling to NULL location.");
             return;
         }
         MultiverseWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName());