From 6e01194a814162de09d67491070a38f9cfd9f222 Mon Sep 17 00:00:00 2001 From: BerkieBb <82737367+BerkieBb@users.noreply.github.com> Date: Fri, 13 Aug 2021 23:33:30 +0200 Subject: [PATCH 1/5] Fix distance and double message for admins --- server/commands.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/commands.lua b/server/commands.lua index e764d32..0f6cffa 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -145,7 +145,6 @@ end, "admin") QBCore.Commands.Add("ooc", "OOC Chat Message", {}, false, function(source, args) local message = table.concat(args, " ") - TriggerClientEvent("QBCore:Client:LocalOutOfCharacter", -1, source, GetPlayerName(source), message) local Players = QBCore.Functions.GetPlayers() local Player = QBCore.Functions.GetPlayer(source) @@ -155,6 +154,8 @@ QBCore.Commands.Add("ooc", "OOC Chat Message", {}, false, function(source, args) TriggerClientEvent('chatMessage', v, "OOC " .. GetPlayerName(source), "normal", message) TriggerEvent("qb-log:server:CreateLog", "ooc", "OOC", "white", "**"..GetPlayerName(source).."** (CitizenID: "..Player.PlayerData.citizenid.." | ID: "..source..") **Message:** " ..message, false) end + elseif #(GetEntityCoords(source) - GetEntityCoords(v)) < 20.0 then + TriggerClientEvent('chatMessage', v, "OOC " .. GetPlayerName(source), "normal", message) end end end) From 1279c941d41b9d8f4641338f91d3c80b5f2d56e9 Mon Sep 17 00:00:00 2001 From: BerkieBb <82737367+BerkieBb@users.noreply.github.com> Date: Fri, 13 Aug 2021 23:33:47 +0200 Subject: [PATCH 2/5] Remove unused event --- client/events.lua | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/client/events.lua b/client/events.lua index 3e47379..d506f6f 100644 --- a/client/events.lua +++ b/client/events.lua @@ -116,16 +116,6 @@ AddEventHandler('QBCore:Player:UpdatePlayerPosition', function() TriggerServerEvent('QBCore:UpdatePlayerPosition', position) end) -RegisterNetEvent('QBCore:Client:LocalOutOfCharacter') -AddEventHandler('QBCore:Client:LocalOutOfCharacter', function(playerId, playerName, message) - local sourcePos = GetEntityCoords(GetPlayerPed(GetPlayerFromServerId(playerId)), false) - local pos = GetEntityCoords(PlayerPedId(), false) - local dist = #(pos - sourcePos) - if dist < 20.0 then - TriggerEvent("chatMessage", "OOC " .. playerName, "normal", message) - end -end) - RegisterNetEvent('QBCore:Notify') AddEventHandler('QBCore:Notify', function(text, type, length) QBCore.Functions.Notify(text, type, length) From f579284bc4c5abf6d42420fad880235fcb59068f Mon Sep 17 00:00:00 2001 From: BerkieBb <82737367+BerkieBb@users.noreply.github.com> Date: Sat, 14 Aug 2021 00:01:20 +0200 Subject: [PATCH 3/5] Fix entity --- server/commands.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/commands.lua b/server/commands.lua index 0f6cffa..919e72b 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -154,7 +154,7 @@ QBCore.Commands.Add("ooc", "OOC Chat Message", {}, false, function(source, args) TriggerClientEvent('chatMessage', v, "OOC " .. GetPlayerName(source), "normal", message) TriggerEvent("qb-log:server:CreateLog", "ooc", "OOC", "white", "**"..GetPlayerName(source).."** (CitizenID: "..Player.PlayerData.citizenid.." | ID: "..source..") **Message:** " ..message, false) end - elseif #(GetEntityCoords(source) - GetEntityCoords(v)) < 20.0 then + elseif #(GetEntityCoords(GetPlayerPed(source)) - GetEntityCoords(GetPlayerPed(v))) < 20.0 then TriggerClientEvent('chatMessage', v, "OOC " .. GetPlayerName(source), "normal", message) end end From d11556f116cd0305205730016886b3331350923a Mon Sep 17 00:00:00 2001 From: BerkieBb <82737367+BerkieBb@users.noreply.github.com> Date: Sat, 14 Aug 2021 01:44:41 +0200 Subject: [PATCH 4/5] Change message for admins --- server/commands.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/commands.lua b/server/commands.lua index 919e72b..49b2417 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -151,7 +151,7 @@ QBCore.Commands.Add("ooc", "OOC Chat Message", {}, false, function(source, args) for k, v in pairs(QBCore.Functions.GetPlayers()) do if QBCore.Functions.HasPermission(v, "admin") then if QBCore.Functions.IsOptin(v) then - TriggerClientEvent('chatMessage', v, "OOC " .. GetPlayerName(source), "normal", message) + TriggerClientEvent('chatMessage', v, "Proximity OOC " .. GetPlayerName(source), "normal", message) TriggerEvent("qb-log:server:CreateLog", "ooc", "OOC", "white", "**"..GetPlayerName(source).."** (CitizenID: "..Player.PlayerData.citizenid.." | ID: "..source..") **Message:** " ..message, false) end elseif #(GetEntityCoords(GetPlayerPed(source)) - GetEntityCoords(GetPlayerPed(v))) < 20.0 then From 848ea348e7467d19a48f7cab0d928050e96ac402 Mon Sep 17 00:00:00 2001 From: BerkieBb <82737367+BerkieBb@users.noreply.github.com> Date: Sat, 14 Aug 2021 01:47:38 +0200 Subject: [PATCH 5/5] Fix proximity showing when you are the sender and admin --- server/commands.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/commands.lua b/server/commands.lua index 49b2417..a156c26 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -149,7 +149,9 @@ QBCore.Commands.Add("ooc", "OOC Chat Message", {}, false, function(source, args) local Player = QBCore.Functions.GetPlayer(source) for k, v in pairs(QBCore.Functions.GetPlayers()) do - if QBCore.Functions.HasPermission(v, "admin") then + if v == source then + TriggerClientEvent('chatMessage', v, "OOC " .. GetPlayerName(source), "normal", message) + elseif QBCore.Functions.HasPermission(v, "admin") then if QBCore.Functions.IsOptin(v) then TriggerClientEvent('chatMessage', v, "Proximity OOC " .. GetPlayerName(source), "normal", message) TriggerEvent("qb-log:server:CreateLog", "ooc", "OOC", "white", "**"..GetPlayerName(source).."** (CitizenID: "..Player.PlayerData.citizenid.." | ID: "..source..") **Message:** " ..message, false)