CraftAttack/world-museum
Archived
5
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 3 Wiki Activity

Fixed indefinite loading bug

Browse Source 
Removed verbose logging
Changed loading-text
This commit is contained in:
Elias Müller 2023-10-23 08:11:13 +02:00
parent bb363dc06f
commit 6b2b25ce5e
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/mhsl/craftattack/worldmuseum/util/MuseumPlayer.java
View File

@ -2,7 +2,6 @@ package eu.mhsl.craftattack.worldmuseum.util;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.title.Title; import net.kyori.adventure.title.Title;
import net.minestom.server.MinecraftServer; import net.minestom.server.MinecraftServer;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
@ -30,11 +29,10 @@ public class MuseumPlayer extends Player {
public void startLoading() { public void startLoading() {
isLoading = true; isLoading = true;
MinecraftServer.getSchedulerManager().submitTask(() -> { MinecraftServer.getSchedulerManager().submitTask(() -> {
sendMessage("" + System.currentTimeMillis());
addEffect(new Potion(PotionEffect.BLINDNESS, (byte) 3, 600)); addEffect(new Potion(PotionEffect.BLINDNESS, (byte) 3, 600));
showTitle(Title.title( showTitle(Title.title(
Component.text("Loading").decorate(TextDecoration.BOLD).color(NamedTextColor.GOLD), Component.text("Welt wird geladen").color(NamedTextColor.GOLD),
Component.text("...").color(NamedTextColor.YELLOW), Component.text("...").color(NamedTextColor.GOLD),
Title.Times.times(Duration.ZERO, Duration.ofSeconds(30), Duration.ZERO) Title.Times.times(Duration.ZERO, Duration.ofSeconds(30), Duration.ZERO)
)); ));

19
src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/VoidWorld.java
View File

@ -33,15 +33,22 @@ public class VoidWorld extends InstanceContainer implements PlayerMovable {
public void movePlayer(Player p) { public void movePlayer(Player p) {
MuseumPlayer museumPlayer = (MuseumPlayer) p; MuseumPlayer museumPlayer = (MuseumPlayer) p;
if(p.getInstance() != this) p.setInstance(this).thenRun(() -> {
p.teleport(getSpawn());
p.openInventory(new WorldSelector());
museumPlayer.stopLoading();
});
museumPlayer.startLoading(); museumPlayer.startLoading();
if(p.getInstance() != this) {
p.setInstance(this).thenRun(() -> onTpComplete(museumPlayer));
} else {
onTpComplete(museumPlayer);
}
p.getInventory().clear(); p.getInventory().clear();
p.setRespawnPoint(getSpawn()); p.setRespawnPoint(getSpawn());
p.setAllowFlying(false); p.setAllowFlying(false);
} }
private void onTpComplete(MuseumPlayer p) {
p.teleport(getSpawn());
p.openInventory(new WorldSelector());
p.stopLoading();
}
} }