From f9aec0fe580af737270a108b2ceecff12987c75f Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 27 Apr 2023 21:41:01 +0200 Subject: [PATCH] fixing TeleportCommand --- .../worldmuseum/commands/TeleportCommand.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/commands/TeleportCommand.java b/src/main/java/eu/mhsl/craftattack/worldmuseum/commands/TeleportCommand.java index 1a0a09b..baf023f 100644 --- a/src/main/java/eu/mhsl/craftattack/worldmuseum/commands/TeleportCommand.java +++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/commands/TeleportCommand.java @@ -4,20 +4,22 @@ import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.entity.Player; +import java.util.Objects; + public class TeleportCommand extends Command { public TeleportCommand() { super("tp","teleport"); - setDefaultExecutor(((sender, context) -> { - sender.sendMessage("test"); - })); var playerArgument = ArgumentType.Entity("Spieler").onlyPlayers(true); addSyntax(((sender, context) -> { Player targetPlayer = (Player) context.get(playerArgument).find(sender).get(0); Player p = (Player) sender; - p.teleport(targetPlayer.getPosition()); + if (!Objects.equals(p.getInstance(), targetPlayer.getInstance())) + p.setInstance(Objects.requireNonNull(targetPlayer.getInstance()), targetPlayer.getPosition()); + else + p.teleport(targetPlayer.getPosition()); }), playerArgument); } }