@kugge: Fixed Folia teleportation in unloaded chunks (#368)

PlayPro · Jul 14, 2023 · 355eea1 · 355eea1
1 parent d7b7613
commit 355eea1
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/java/net/coreprotect/command/TeleportCommand.java b/src/main/java/net/coreprotect/command/TeleportCommand.java
@@ -6,8 +6,10 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import net.coreprotect.CoreProtect;
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.language.Phrase;
+import net.coreprotect.thread.Scheduler;
 import net.coreprotect.utility.Chat;
 import net.coreprotect.utility.ChatMessage;
 import net.coreprotect.utility.Color;
@@ -99,12 +101,14 @@ else if (y == null) {
 
         int chunkX = location.getBlockX() >> 4;
         int chunkZ = location.getBlockZ() >> 4;
-        if (location.getWorld().isChunkLoaded(chunkX, chunkZ) == false) {
-            location.getWorld().getChunkAt(location);
-        }
+        Scheduler.runTask(CoreProtect.getInstance(), () -> {
+            if (!location.getWorld().isChunkLoaded(chunkX, chunkZ)) {
+                location.getWorld().getChunkAt(location);
+            }
 
-        // Teleport the player to a safe location
-        Teleport.performSafeTeleport(((Player) player), location, true);
+            // Teleport the player to a safe location
+            Teleport.performSafeTeleport(((Player) player), location, true);
+        }, location);
 
         ConfigHandler.teleportThrottle.put(player.getName(), new Object[] { false, System.currentTimeMillis() });
     }