Replace PlayerPed

This commit is contained in:
GhzGarage
2021-04-02 22:26:42 -05:00
parent 3948415301
commit be3e23ec93
3 changed files with 17 additions and 17 deletions
+10 -10
View File
@@ -2,7 +2,7 @@
RegisterNetEvent('QBCore:Command:TeleportToPlayer') RegisterNetEvent('QBCore:Command:TeleportToPlayer')
AddEventHandler('QBCore:Command:TeleportToPlayer', function(othersource) AddEventHandler('QBCore:Command:TeleportToPlayer', function(othersource)
local coords = QBCore.Functions.GetCoords(GetPlayerPed(GetPlayerFromServerId(othersource))) local coords = QBCore.Functions.GetCoords(GetPlayerPed(GetPlayerFromServerId(othersource)))
local entity = GetPlayerPed(-1) local entity = PlayerPedId()
if IsPedInAnyVehicle(Entity, false) then if IsPedInAnyVehicle(Entity, false) then
entity = GetVehiclePedIsUsing(entity) entity = GetVehiclePedIsUsing(entity)
end end
@@ -12,7 +12,7 @@ end)
RegisterNetEvent('QBCore:Command:TeleportToCoords') RegisterNetEvent('QBCore:Command:TeleportToCoords')
AddEventHandler('QBCore:Command:TeleportToCoords', function(x, y, z) AddEventHandler('QBCore:Command:TeleportToCoords', function(x, y, z)
local entity = GetPlayerPed(-1) local entity = PlayerPedId()
if IsPedInAnyVehicle(Entity, false) then if IsPedInAnyVehicle(Entity, false) then
entity = GetVehiclePedIsUsing(entity) entity = GetVehiclePedIsUsing(entity)
end end
@@ -22,7 +22,7 @@ end)
RegisterNetEvent('QBCore:Command:SpawnVehicle') RegisterNetEvent('QBCore:Command:SpawnVehicle')
AddEventHandler('QBCore:Command:SpawnVehicle', function(model) AddEventHandler('QBCore:Command:SpawnVehicle', function(model)
QBCore.Functions.SpawnVehicle(model, function(vehicle) QBCore.Functions.SpawnVehicle(model, function(vehicle)
TaskWarpPedIntoVehicle(GetPlayerPed(-1), vehicle, -1) TaskWarpPedIntoVehicle(PlayerPedId(), vehicle, -1)
TriggerEvent("vehiclekeys:client:SetOwner", GetVehicleNumberPlateText(vehicle)) TriggerEvent("vehiclekeys:client:SetOwner", GetVehicleNumberPlateText(vehicle))
end) end)
end) end)
@@ -30,17 +30,17 @@ end)
RegisterNetEvent('QBCore:Command:DeleteVehicle') RegisterNetEvent('QBCore:Command:DeleteVehicle')
AddEventHandler('QBCore:Command:DeleteVehicle', function() AddEventHandler('QBCore:Command:DeleteVehicle', function()
local vehicle = QBCore.Functions.GetClosestVehicle() local vehicle = QBCore.Functions.GetClosestVehicle()
if IsPedInAnyVehicle(GetPlayerPed(-1)) then vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) else vehicle = QBCore.Functions.GetClosestVehicle() end if IsPedInAnyVehicle(PlayerPedId()) then vehicle = GetVehiclePedIsIn(PlayerPedId(), false) else vehicle = QBCore.Functions.GetClosestVehicle() end
-- TriggerServerEvent('QBCore:Command:CheckOwnedVehicle', GetVehicleNumberPlateText(vehicle)) -- TriggerServerEvent('QBCore:Command:CheckOwnedVehicle', GetVehicleNumberPlateText(vehicle))
QBCore.Functions.DeleteVehicle(vehicle) QBCore.Functions.DeleteVehicle(vehicle)
end) end)
RegisterNetEvent('QBCore:Command:Revive') RegisterNetEvent('QBCore:Command:Revive')
AddEventHandler('QBCore:Command:Revive', function() AddEventHandler('QBCore:Command:Revive', function()
local coords = QBCore.Functions.GetCoords(GetPlayerPed(-1)) local coords = QBCore.Functions.GetCoords(PlayerPedId())
NetworkResurrectLocalPlayer(coords.x, coords.y, coords.z+0.2, coords.a, true, false) NetworkResurrectLocalPlayer(coords.x, coords.y, coords.z+0.2, coords.a, true, false)
SetPlayerInvincible(GetPlayerPed(-1), false) SetPlayerInvincible(PlayerPedId(), false)
ClearPedBloodDamage(GetPlayerPed(-1)) ClearPedBloodDamage(PlayerPedId())
end) end)
RegisterNetEvent('QBCore:Command:GoToMarker') RegisterNetEvent('QBCore:Command:GoToMarker')
@@ -114,20 +114,20 @@ end)
RegisterNetEvent('QBCore:Player:UpdatePlayerData') RegisterNetEvent('QBCore:Player:UpdatePlayerData')
AddEventHandler('QBCore:Player:UpdatePlayerData', function() AddEventHandler('QBCore:Player:UpdatePlayerData', function()
local data = {} local data = {}
data.position = QBCore.Functions.GetCoords(GetPlayerPed(-1)) data.position = QBCore.Functions.GetCoords(PlayerPedId())
TriggerServerEvent('QBCore:UpdatePlayer', data) TriggerServerEvent('QBCore:UpdatePlayer', data)
end) end)
RegisterNetEvent('QBCore:Player:UpdatePlayerPosition') RegisterNetEvent('QBCore:Player:UpdatePlayerPosition')
AddEventHandler('QBCore:Player:UpdatePlayerPosition', function() AddEventHandler('QBCore:Player:UpdatePlayerPosition', function()
local position = QBCore.Functions.GetCoords(GetPlayerPed(-1)) local position = QBCore.Functions.GetCoords(PlayerPedId())
TriggerServerEvent('QBCore:UpdatePlayerPosition', position) TriggerServerEvent('QBCore:UpdatePlayerPosition', position)
end) end)
RegisterNetEvent('QBCore:Client:LocalOutOfCharacter') RegisterNetEvent('QBCore:Client:LocalOutOfCharacter')
AddEventHandler('QBCore:Client:LocalOutOfCharacter', function(playerId, playerName, message) AddEventHandler('QBCore:Client:LocalOutOfCharacter', function(playerId, playerName, message)
local sourcePos = GetEntityCoords(GetPlayerPed(GetPlayerFromServerId(playerId)), false) local sourcePos = GetEntityCoords(GetPlayerPed(GetPlayerFromServerId(playerId)), false)
local pos = GetEntityCoords(GetPlayerPed(-1), false) local pos = GetEntityCoords(PlayerPedId(), false)
if (GetDistanceBetweenCoords(pos.x, pos.y, pos.z, sourcePos.x, sourcePos.y, sourcePos.z, true) < 20.0) then if (GetDistanceBetweenCoords(pos.x, pos.y, pos.z, sourcePos.x, sourcePos.y, sourcePos.z, true) < 20.0) then
TriggerEvent("chatMessage", "OOC " .. playerName, "normal", message) TriggerEvent("chatMessage", "OOC " .. playerName, "normal", message)
end end
+6 -6
View File
@@ -51,7 +51,7 @@ end
QBCore.Functions.SpawnVehicle = function(model, cb, coords, isnetworked) QBCore.Functions.SpawnVehicle = function(model, cb, coords, isnetworked)
local model = (type(model)=="number" and model or GetHashKey(model)) local model = (type(model)=="number" and model or GetHashKey(model))
local coords = coords ~= nil and coords or QBCore.Functions.GetCoords(GetPlayerPed(-1)) local coords = coords ~= nil and coords or QBCore.Functions.GetCoords(PlayerPedId())
local isnetworked = isnetworked ~= nil and isnetworked or true local isnetworked = isnetworked ~= nil and isnetworked or true
RequestModel(model) RequestModel(model)
@@ -159,7 +159,7 @@ end
QBCore.Functions.GetClosestVehicle = function(coords) QBCore.Functions.GetClosestVehicle = function(coords)
--[[local coordFrom = coords --[[local coordFrom = coords
local playerPed = GetPlayerPed(-1) local playerPed = PlayerPedId()
if coordFrom == nil then if coordFrom == nil then
coordFrom = GetEntityCoords(playerPed) coordFrom = GetEntityCoords(playerPed)
@@ -171,7 +171,7 @@ QBCore.Functions.GetClosestVehicle = function(coords)
local vehicle local vehicle
for i = 0, 100 do for i = 0, 100 do
rayHandle = CastRayPointToPoint(coordFrom.x, coordFrom.y, coordFrom.z, coordTo.x, coordTo.y, coordTo.z + offset, 10, GetPlayerPed(-1), 0) rayHandle = CastRayPointToPoint(coordFrom.x, coordFrom.y, coordFrom.z, coordTo.x, coordTo.y, coordTo.z + offset, 10, PlayerPedId(), 0)
a, b, c, d, vehicle = GetRaycastResult(rayHandle) a, b, c, d, vehicle = GetRaycastResult(rayHandle)
offset = offset - 1 offset = offset - 1
@@ -213,7 +213,7 @@ QBCore.Functions.GetClosestPed = function(coords, ignoreList)
local closestPed = -1 local closestPed = -1
if coords == nil then if coords == nil then
coords = GetEntityCoords(GetPlayerPed(-1)) coords = GetEntityCoords(PlayerPedId())
end end
for i=1, #peds, 1 do for i=1, #peds, 1 do
@@ -232,7 +232,7 @@ end
QBCore.Functions.GetClosestPlayer = function(coords) QBCore.Functions.GetClosestPlayer = function(coords)
if coords == nil then if coords == nil then
coords = GetEntityCoords(GetPlayerPed(-1)) coords = GetEntityCoords(PlayerPedId())
end end
local closestPlayers = QBCore.Functions.GetPlayersFromCoords(coords) local closestPlayers = QBCore.Functions.GetPlayersFromCoords(coords)
@@ -259,7 +259,7 @@ QBCore.Functions.GetPlayersFromCoords = function(coords, distance)
local closePlayers = {} local closePlayers = {}
if coords == nil then if coords == nil then
coords = GetEntityCoords(GetPlayerPed(-1)) coords = GetEntityCoords(PlayerPedId())
end end
if distance == nil then if distance == nil then
distance = 5.0 distance = 5.0
+1 -1
View File
@@ -38,7 +38,7 @@ Citizen.CreateThread(function()
Citizen.Wait(math.random(3000, 5000)) Citizen.Wait(math.random(3000, 5000))
if isLoggedIn then if isLoggedIn then
if QBCore.Functions.GetPlayerData().metadata["hunger"] <= 0 or QBCore.Functions.GetPlayerData().metadata["thirst"] <= 0 then if QBCore.Functions.GetPlayerData().metadata["hunger"] <= 0 or QBCore.Functions.GetPlayerData().metadata["thirst"] <= 0 then
local ped = GetPlayerPed(-1) local ped = PlayerPedId()
local currentHealth = GetEntityHealth(ped) local currentHealth = GetEntityHealth(ped)
SetEntityHealth(ped, currentHealth - math.random(5, 10)) SetEntityHealth(ped, currentHealth - math.random(5, 10))