From 41ec2316e40880e2f42fbc65530900b2f35863e8 Mon Sep 17 00:00:00 2001
From: KingRainbow44 <kobedo11@gmail.com>
Date: Sun, 24 Jul 2022 13:23:51 -0400
Subject: [PATCH] Attempt to fix the `teleport` command.

---
 .../grasscutter/command/commands/TeleportCommand.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
index a08565d79..b78778b77 100644
--- 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 final class TeleportCommand implements CommandHandler {
 
         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 {