From 2f629f138676486025729921b4fca13e60905561 Mon Sep 17 00:00:00 2001
From: Moderocky <admin@moderocky.com>
Date: Mon, 1 Jul 2024 17:23:58 +0100
Subject: [PATCH] Attempt to estimate world in teleport when it's not
 specified. (#6611)

---
 .../ch/njol/skript/effects/EffTeleport.java   | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ch/njol/skript/effects/EffTeleport.java b/src/main/java/ch/njol/skript/effects/EffTeleport.java
index 3ba06d7d150..990e1aa7ec1 100644
--- a/src/main/java/ch/njol/skript/effects/EffTeleport.java
+++ b/src/main/java/ch/njol/skript/effects/EffTeleport.java
@@ -19,7 +19,6 @@
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.sections.EffSecSpawn;
 import ch.njol.skript.sections.EffSecSpawn.SpawnEvent;
 import ch.njol.skript.bukkitutil.EntityUtils;
 import ch.njol.skript.doc.Description;
@@ -31,7 +30,6 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.lang.TriggerItem;
-import ch.njol.skript.lang.TriggerSection;
 import ch.njol.skript.timings.SkriptTimings;
 import ch.njol.skript.util.Direction;
 import ch.njol.skript.variables.Variables;
@@ -53,7 +51,7 @@
 	"which may cause lag spikes or server crashes when using this effect to teleport entities to unloaded chunks."
 })
 @Examples({
-	"teleport the player to {homes.%player%}",
+	"teleport the player to {homes::%player%}",
 	"teleport the attacker to the victim"
 })
 @Since("1.0")
@@ -101,6 +99,7 @@ protected TriggerItem walk(Event e) {
 		Location loc = location.getSingle(e);
 		if (loc == null)
 			return next;
+		boolean unknownWorld = !loc.isWorldLoaded();
 
 		Entity[] entityArray = entities.getArray(e); // We have to fetch this before possible async execution to avoid async local variable access.
 		if (entityArray.length == 0)
@@ -108,11 +107,17 @@ protected TriggerItem walk(Event e) {
 
 		if (!delayed) {
 			if (e instanceof PlayerRespawnEvent && entityArray.length == 1 && entityArray[0].equals(((PlayerRespawnEvent) e).getPlayer())) {
+				if (unknownWorld)
+					return next;
 				((PlayerRespawnEvent) e).setRespawnLocation(loc);
 				return next;
 			}
 
 			if (e instanceof PlayerMoveEvent && entityArray.length == 1 && entityArray[0].equals(((PlayerMoveEvent) e).getPlayer())) {
+				if (unknownWorld) { // we can approximate the world
+					loc = loc.clone();
+					loc.setWorld(((PlayerMoveEvent) e).getFrom().getWorld());
+				}
 				((PlayerMoveEvent) e).setTo(loc);
 				return next;
 			}
@@ -125,6 +130,19 @@ protected TriggerItem walk(Event e) {
 			return next;
 		}
 
+		if (unknownWorld) { // we can't fetch the chunk without a world
+			if (entityArray.length == 1) { // if there's 1 thing we can borrow its world
+				Entity entity = entityArray[0];
+				if (entity == null)
+					return next;
+				// assume it's a local teleport, use the first entity we find as a reference
+				loc = loc.clone();
+				loc.setWorld(entity.getWorld());
+			} else {
+				return next; // no entities = no chunk = nobody teleporting
+			}
+		}
+		final Location fixed = loc;
 		Delay.addDelayedEvent(e);
 		Object localVars = Variables.removeLocals(e);
 		
@@ -132,7 +150,7 @@ protected TriggerItem walk(Event e) {
 		PaperLib.getChunkAtAsync(loc).thenAccept(chunk -> {
 			// The following is now on the main thread
 			for (Entity entity : entityArray) {
-				EntityUtils.teleport(entity, loc);
+				EntityUtils.teleport(entity, fixed);
 			}
 
 			// Re-set local variables