From f1c31b84eb8c1ca85d3f9b8e597ffa5a070834e7 Mon Sep 17 00:00:00 2001 From: EXtremeExploit Date: Sat, 17 Aug 2024 18:10:14 -0300 Subject: [PATCH] Use safe teleport --- .../listeners/MVNPEntityListener.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/onarandombox/MultiverseNetherPortals/listeners/MVNPEntityListener.java b/src/main/java/com/onarandombox/MultiverseNetherPortals/listeners/MVNPEntityListener.java index 8217932..0103d07 100644 --- a/src/main/java/com/onarandombox/MultiverseNetherPortals/listeners/MVNPEntityListener.java +++ b/src/main/java/com/onarandombox/MultiverseNetherPortals/listeners/MVNPEntityListener.java @@ -5,6 +5,7 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager; import com.onarandombox.MultiverseCore.api.MultiverseMessaging; import com.onarandombox.MultiverseCore.api.MultiverseWorld; +import com.onarandombox.MultiverseCore.api.SafeTTeleporter; import com.onarandombox.MultiverseCore.event.MVPlayerTouchedPortalEvent; import com.onarandombox.MultiverseCore.utils.PermissionTools; import com.onarandombox.MultiverseNetherPortals.MultiverseNetherPortals; @@ -171,7 +172,9 @@ private Location getLocation(Entity e, Location currentLocation, PortalType type if (shouldAppearAtSpawn) { MultiverseWorld tpTo = this.worldManager.getMVWorld(destinationWorld); - newTo = this.linkChecker.findNewTeleportLocation(tpTo.getSpawnLocation(), destinationWorld, e); + SafeTTeleporter teleporter = this.plugin.getCore().getSafeTTeleporter(); + Location safeSpawn = teleporter.getSafeLocation(tpTo.getSpawnLocation()); + newTo = this.linkChecker.findNewTeleportLocation(safeSpawn, destinationWorld, e); } else { newTo = this.linkChecker.findNewTeleportLocation(currentLocation, destinationWorld, e); }