From 99c3b611dc2adaaa4b1d1c5c815cd6a5738cef0d Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@gmail.com>
Date: Fri, 23 Jan 2026 13:33:18 +0100
Subject: [PATCH] Stops measuring distances across worlds

---
 .../knarcraft/stargate/listener/StargateTeleportListener.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/net/knarcraft/stargate/listener/StargateTeleportListener.java b/src/main/java/net/knarcraft/stargate/listener/StargateTeleportListener.java
index 7ea7b71..8a4efa7 100644
--- a/src/main/java/net/knarcraft/stargate/listener/StargateTeleportListener.java
+++ b/src/main/java/net/knarcraft/stargate/listener/StargateTeleportListener.java
@@ -79,6 +79,7 @@ public class StargateTeleportListener implements Listener {
         // Cancel end gateway teleportation to the same destination
         if (event.getTo() != null && cause == PlayerTeleportEvent.TeleportCause.END_GATEWAY &&
                 PortalHandler.getByAdjacentEntrance(event.getFrom()) != null &&
+                event.getFrom().getWorld() != null && event.getFrom().getWorld().equals(event.getTo().getWorld()) &&
                 event.getFrom().distance(event.getTo()) <= 1) {
             event.setCancelled(true);
         }