Attempt to fix the teleport command.

GoJam11 · Jul 24, 2022 · 41ec231 · 41ec231
1 parent 818bfb8
commit 41ec231
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
@@ -55,10 +55,15 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
 
         Position target_pos = new Position(x, y, z);
         PlayerTeleportEvent event = new PlayerTeleportEvent(targetPlayer, PlayerTeleportEvent.TeleportType.COMMAND,
-            targetPlayer.getPos(), target_pos);
+            targetPlayer.getPosition(), target_pos);
         event.call();
 
-        boolean result = !event.isCanceled() || targetPlayer.getWorld().transferPlayerToScene(targetPlayer, sceneId, event.getDestination());
+        // Return if event was cancelled.
+        if(event.isCanceled()) {
+            return;
+        }
+
+        boolean result = targetPlayer.getWorld().transferPlayerToScene(targetPlayer, sceneId, event.getDestination());
         if (!result) {
             CommandHandler.sendMessage(sender, translate(sender, "commands.teleport.exists_error"));
         } else {