From 6b2b25ce5e9dc95126827c435897e8881eb5dc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Mon, 23 Oct 2023 08:11:13 +0200
Subject: [PATCH] Fixed indefinite loading bug Removed verbose logging Changed
 loading-text

---
 .../worldmuseum/util/MuseumPlayer.java        |  6 ++----
 .../worldmuseum/worlds/VoidWorld.java         | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/MuseumPlayer.java b/src/main/java/eu/mhsl/craftattack/worldmuseum/util/MuseumPlayer.java
index 4955be8..7b02917 100644
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/MuseumPlayer.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/util/MuseumPlayer.java
@@ -2,7 +2,6 @@ package eu.mhsl.craftattack.worldmuseum.util;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
-import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.title.Title;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.entity.Player;
@@ -30,11 +29,10 @@ public class MuseumPlayer extends Player {
     public void startLoading() {
         isLoading = true;
         MinecraftServer.getSchedulerManager().submitTask(() -> {
-            sendMessage("" + System.currentTimeMillis());
             addEffect(new Potion(PotionEffect.BLINDNESS, (byte) 3, 600));
             showTitle(Title.title(
-                    Component.text("Loading").decorate(TextDecoration.BOLD).color(NamedTextColor.GOLD),
-                    Component.text("...").color(NamedTextColor.YELLOW),
+                    Component.text("Welt wird geladen").color(NamedTextColor.GOLD),
+                    Component.text("...").color(NamedTextColor.GOLD),
                     Title.Times.times(Duration.ZERO, Duration.ofSeconds(30), Duration.ZERO)
             ));
 
diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/VoidWorld.java b/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/VoidWorld.java
index 128261d..a72dff4 100644
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/VoidWorld.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/VoidWorld.java
@@ -33,15 +33,22 @@ public class VoidWorld extends InstanceContainer implements PlayerMovable {
 
     public void movePlayer(Player p) {
         MuseumPlayer museumPlayer = (MuseumPlayer) p;
-        if(p.getInstance() != this) p.setInstance(this).thenRun(() -> {
-            p.teleport(getSpawn());
-            p.openInventory(new WorldSelector());
-            museumPlayer.stopLoading();
-        });
-
         museumPlayer.startLoading();
+
+        if(p.getInstance() != this) {
+            p.setInstance(this).thenRun(() -> onTpComplete(museumPlayer));
+        } else {
+            onTpComplete(museumPlayer);
+        }
+
         p.getInventory().clear();
         p.setRespawnPoint(getSpawn());
         p.setAllowFlying(false);
     }
+
+    private void onTpComplete(MuseumPlayer p) {
+        p.teleport(getSpawn());
+        p.openInventory(new WorldSelector());
+        p.stopLoading();
+    }
 }