From 71832114c87fddae03fc06de6890c60582c79f70 Mon Sep 17 00:00:00 2001
From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com>
Date: Sun, 23 Jan 2022 23:56:08 +0100
Subject: [PATCH] Update commands.lua

Moved a lot of commands to server side, made them better, and added a /911 call.
---
 ND_Core/source/client/commands.lua | 43 ++++++++++++------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/ND_Core/source/client/commands.lua b/ND_Core/source/client/commands.lua
index 0bcb023..aa78e9c 100644
--- a/ND_Core/source/client/commands.lua
+++ b/ND_Core/source/client/commands.lua
@@ -12,12 +12,12 @@ if config.enableAopCommand then
         { name="Area", help="Area of Play" }
     })
     TriggerEvent("chat:addSuggestion", "/" .. config.checkAopCommand, "Check the current Area of Play.", {})
-    RegisterCommand(config.checkAopCommand, function(source, args, raw)
+    RegisterCommand(config.checkAopCommand, function(source, args, rawCommand)
         TriggerServerEvent("getAop")
     end, false)
-    RegisterCommand(config.aopCommand, function(source, args, raw)
+    RegisterCommand(config.aopCommand, function(source, args, rawCommand)
         if admin then
-            TriggerServerEvent("registerAop", string.gsub(raw, config.aopCommand .. " ", ""))
+            TriggerServerEvent("registerAop", string.sub(rawCommand, string.len(config.aopCommand + 1), string.len(rawCommand)))
         else
             TriggerEvent("chat:addMessage", {
                 args = {"~r~You don't have permission to set the aop."}
@@ -48,31 +48,22 @@ if config.enableAopCommand then
     end)
 end
 
--- Twotter command
-RegisterCommand("twt", function(source, args, rawCommand)
-    TriggerServerEvent("twt", GetPlayerServerId(PlayerId()), mainTwtName, string.gsub(rawCommand, "twt", ""))
-end, false)
-RegisterNetEvent("twt")
-AddEventHandler("twt", function(id, twtName, twt)
+RegisterNetEvent("911")
+AddEventHandler("911", function(coords, rawCommand)
+    local location = GetStreetNameFromHashKey(GetStreetNameAtCoord(coords.x, coords.y, coords.z))
     TriggerEvent("chat:addMessage", {
-        template = "<img src='data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxz%0D%0AdmcKICB2aWV3Ym94PSIwIDAgMjAwMCAxNjI1LjM2IgogIHdpZHRoPSIyMDAwIgogIGhlaWdodD0i%0D%0AMTYyNS4zNiIKICB2ZXJzaW9uPSIxLjEiCiAgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv%0D%0Ac3ZnIj4KICA8cGF0aAogICAgZD0ibSAxOTk5Ljk5OTksMTkyLjQgYyAtNzMuNTgsMzIuNjQgLTE1%0D%0AMi42Nyw1NC42OSAtMjM1LjY2LDY0LjYxIDg0LjcsLTUwLjc4IDE0OS43NywtMTMxLjE5IDE4MC40%0D%0AMSwtMjI3LjAxIC03OS4yOSw0Ny4wMyAtMTY3LjEsODEuMTcgLTI2MC41Nyw5OS41NyBDIDE2MDku%0D%0AMzM5OSw0OS44MiAxNTAyLjY5OTksMCAxMzg0LjY3OTksMCBjIC0yMjYuNiwwIC00MTAuMzI4LDE4%0D%0AMy43MSAtNDEwLjMyOCw0MTAuMzEgMCwzMi4xNiAzLjYyOCw2My40OCAxMC42MjUsOTMuNTEgLTM0%0D%0AMS4wMTYsLTE3LjExIC02NDMuMzY4LC0xODAuNDcgLTg0NS43MzksLTQyOC43MiAtMzUuMzI0LDYw%0D%0ALjYgLTU1LjU1ODMsMTMxLjA5IC01NS41NTgzLDIwNi4yOSAwLDE0Mi4zNiA3Mi40MzczLDI2Ny45%0D%0ANSAxODIuNTQzMywzNDEuNTMgLTY3LjI2MiwtMi4xMyAtMTMwLjUzNSwtMjAuNTkgLTE4NS44NTE5%0D%0ALC01MS4zMiAtMC4wMzksMS43MSAtMC4wMzksMy40MiAtMC4wMzksNS4xNiAwLDE5OC44MDMgMTQx%0D%0ALjQ0MSwzNjQuNjM1IDMyOS4xNDUsNDAyLjM0MiAtMzQuNDI2LDkuMzc1IC03MC42NzYsMTQuMzk1%0D%0AIC0xMDguMDk4LDE0LjM5NSAtMjYuNDQxLDAgLTUyLjE0NSwtMi41NzggLTc3LjIwMywtNy4zNjQg%0D%0ANTIuMjE1LDE2My4wMDggMjAzLjc1LDI4MS42NDkgMzgzLjMwNCwyODQuOTQ2IC0xNDAuNDI5LDEx%0D%0AMC4wNjIgLTMxNy4zNTEsMTc1LjY2IC01MDkuNTk3MiwxNzUuNjYgLTMzLjEyMTEsMCAtNjUuNzg1%0D%0AMSwtMS45NDkgLTk3Ljg4MjgsLTUuNzM4IDE4MS41ODYsMTE2LjQxNzYgMzk3LjI3LDE4NC4zNTkg%0D%0ANjI4Ljk4OCwxODQuMzU5IDc1NC43MzIsMCAxMTY3LjQ2MiwtNjI1LjIzOCAxMTY3LjQ2MiwtMTE2%0D%0ANy40NyAwLC0xNy43OSAtMC40MSwtMzUuNDggLTEuMiwtNTMuMDggODAuMTc5OSwtNTcuODYgMTQ5%0D%0ALjczOTksLTEzMC4xMiAyMDQuNzQ5OSwtMjEyLjQxIgogICAgc3R5bGU9ImZpbGw6IzAwYWNlZCIv%0D%0APgo8L3N2Zz4K' height='16'> <b>{0}</b>: {1}",
-        multiline = true,
-        args = {"^4@" .. twtName .. " (#" .. id .. ")", twt}
+        color = {255, 0, 0},
+        args = {"^*[911] ^3Location: " .. location .. " ^1| Call infomation^0", string.sub(rawCommand, 4, string.len(rawCommand))}
     })
-end)
-
--- Me command
-RegisterCommand("me", function(source, args, rawCommand)
-    TriggerServerEvent("me", GetPlayerServerId(PlayerId()), mainFirstName .. " " .. mainLastName, string.gsub(rawCommand, "me", ""), GetEntityCoords(PlayerPedId()))
-end, false)
-RegisterNetEvent("me")
-AddEventHandler("me", function(id, name, msg, coords)
-    if #(coords - GetEntityCoords(PlayerPedId())) < 19.999 then
-        TriggerEvent("chat:addMessage", {
-            color = {255, 0, 0},
-            args = {"^*ME | ^0" .. name .. " (#" .. id .. ")", msg}
-        })
-    end
+    blip = AddBlipForCoord(coords.x, coords.y, coords.z)
+    SetBlipSprite(blip, 817)
+    SetBlipAsShortRange(blip, true)
+    BeginTextCommandSetBlipName("STRING")
+    SetBlipColour(blip, 1)
+    AddTextComponentString("911 CALL: " .. location)
+    EndTextCommandSetBlipName(blip)
+    Citizen.Wait(60 * 1000)
+    RemoveBlip(blip)
 end)
 
 -- Change character command