Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(es_extended/server/modules/commands): add /setdim cmd #1526

Merged
merged 4 commits into from
Dec 6, 2024
+41 −2
Merged

feat(es_extended/server/modules/commands): add /setdim cmd #1526

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e61031
feat(es_extended/server/modules/commands): match target dimension on …
Kenshiin13 Dec 6, 2024
fcdd257
feat(es_extended/server/modules/commands): add /setdim admin cmd
Kenshiin13 Dec 6, 2024
be7a448
fix(es_extended/server/modules/commands): only set dim if needed
Kenshiin13 Dec 6, 2024
6c9726f
refactor(es_extended/server/functions): address lint errors
Kenshiin13 Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(es_extended/server/modules/commands): only set dim if needed
@Kenshiin13
Kenshiin13 committed Dec 6, 2024
commit be7a448feca5b5b513830af68528be8f5179913d
10 changes: 8 additions & 2 deletions [core]/es_extended/server/modules/commands.lua
View file
Original file line number Diff line number Diff line change
@@ -593,9 +593,12 @@ ESX.RegisterCommand(
"admin",
function(xPlayer, args)
local targetCoords = args.playerId.getCoords()
local srcDim = GetPlayerRoutingBucket(xPlayer.source)
local targetDim = GetPlayerRoutingBucket(args.playerId.source)

SetPlayerRoutingBucket(xPlayer.source, targetDim)
if srcDim ~= targetDim then
SetPlayerRoutingBucket(xPlayer.source, targetDim)
end
xPlayer.setCoords(targetCoords)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Admin Teleport /goto Triggered!", "pink", {
@@ -622,9 +625,12 @@ ESX.RegisterCommand(
function(xPlayer, args)
local targetCoords = args.playerId.getCoords()
local playerCoords = xPlayer.getCoords()
local targetDim = GetPlayerRoutingBucket(args.playerId.source)
local srcDim = GetPlayerRoutingBucket(xPlayer.source)

SetPlayerRoutingBucket(args.playerId.source, srcDim)
if targetDim ~= srcDim then
SetPlayerRoutingBucket(args.playerId.source, srcDim)
end
args.playerId.setCoords(playerCoords)
if Config.AdminLogging then
ESX.DiscordLogFields("UserActions", "Admin Teleport /bring Triggered!", "pink", {