From 7e61031c31cdbad95d31dbcbee24e12c17e477ef Mon Sep 17 00:00:00 2001
From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com>
Date: Fri, 6 Dec 2024 10:30:20 +0100
Subject: [PATCH] feat(es_extended/server/modules/commands): match target
 dimension on tp cmds

---
 [core]/es_extended/server/modules/commands.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/[core]/es_extended/server/modules/commands.lua b/[core]/es_extended/server/modules/commands.lua
index 4e9d6862..519f72e4 100644
--- a/[core]/es_extended/server/modules/commands.lua
+++ b/[core]/es_extended/server/modules/commands.lua
@@ -593,6 +593,9 @@ ESX.RegisterCommand(
     "admin",
     function(xPlayer, args)
         local targetCoords = args.playerId.getCoords()
+        local targetDim = GetPlayerRoutingBucket(args.playerId.source)
+
+        SetPlayerRoutingBucket(xPlayer.source, targetDim)
         xPlayer.setCoords(targetCoords)
         if Config.AdminLogging then
             ESX.DiscordLogFields("UserActions", "Admin Teleport /goto Triggered!", "pink", {
@@ -619,6 +622,9 @@ ESX.RegisterCommand(
     function(xPlayer, args)
         local targetCoords = args.playerId.getCoords()
         local playerCoords = xPlayer.getCoords()
+        local srcDim = GetPlayerRoutingBucket(xPlayer.source)
+
+        SetPlayerRoutingBucket(args.playerId.source, srcDim)
         args.playerId.setCoords(playerCoords)
         if Config.AdminLogging then
             ESX.DiscordLogFields("UserActions", "Admin Teleport /bring Triggered!", "pink", {