mirror of
https://github.com/jimathy/jim-boarding.git
synced 2026-04-05 09:03:58 -04:00
Remove client side item functions
Move item adding and removal to server side
This commit is contained in:
@@ -43,11 +43,13 @@ RegisterNetEvent(getScript()..":Skateboard:PickPlace", function(data)
|
|||||||
if not IsPedSittingInAnyVehicle(Ped) then
|
if not IsPedSittingInAnyVehicle(Ped) then
|
||||||
if DoesEntityExist(skateboard.Bike) then
|
if DoesEntityExist(skateboard.Bike) then
|
||||||
Attached = false
|
Attached = false
|
||||||
|
|
||||||
Wait(100)
|
Wait(100)
|
||||||
stopTempCam()
|
stopTempCam()
|
||||||
makeFakeSkateboard(Ped, true, data.prop) -- pick up animation
|
makeFakeSkateboard(Ped, true, data.prop) -- pick up animation
|
||||||
currentToken = triggerCallback(AuthEvent)
|
|
||||||
addItem(lastItem, 1)
|
triggerCallback(getScript()..":auth:collectBoard")
|
||||||
|
|
||||||
skateboard = {}
|
skateboard = {}
|
||||||
Dir = {}
|
Dir = {}
|
||||||
else
|
else
|
||||||
@@ -119,10 +121,9 @@ RegisterNetEvent(getScript()..":Skateboard:PickPlace", function(data)
|
|||||||
storedVariables = skateboard
|
storedVariables = skateboard
|
||||||
SetEntityCoords(skateboard.Bike, GetOffsetFromEntityInWorldCoords(Ped, 0.0, 0.5, 1.5))
|
SetEntityCoords(skateboard.Bike, GetOffsetFromEntityInWorldCoords(Ped, 0.0, 0.5, 1.5))
|
||||||
SetEntityHeading(skateboard.Bike, GetEntityHeading(Ped)+90)
|
SetEntityHeading(skateboard.Bike, GetEntityHeading(Ped)+90)
|
||||||
lastItem = data.name
|
|
||||||
if hasItem(data.name, 1) then
|
triggerCallback(getScript()..":auth:logLastBoard", data.name)
|
||||||
removeItem(data.name, 1)
|
|
||||||
end
|
|
||||||
Dir = {}
|
Dir = {}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -190,9 +191,10 @@ RegisterNetEvent(getScript()..":Skateboard:GetOn", function()
|
|||||||
removeEntityTarget(skateboard.Bike)
|
removeEntityTarget(skateboard.Bike)
|
||||||
removeEntityTarget(skateboard.Driver)
|
removeEntityTarget(skateboard.Driver)
|
||||||
Attached = false
|
Attached = false
|
||||||
|
|
||||||
Wait(100)
|
Wait(100)
|
||||||
currentToken = triggerCallback(AuthEvent)
|
triggerCallback(getScript()..":auth:collectBoard")
|
||||||
addItem(lastItem, 1)
|
|
||||||
skateboard = {}
|
skateboard = {}
|
||||||
Dir = {}
|
Dir = {}
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -42,11 +42,13 @@ RegisterNetEvent(getScript()..":Surfboard:PickPlace", function(data)
|
|||||||
if not IsPedSittingInAnyVehicle(Ped) then
|
if not IsPedSittingInAnyVehicle(Ped) then
|
||||||
if DoesEntityExist(skateboard.Bike) then
|
if DoesEntityExist(skateboard.Bike) then
|
||||||
Attached = false
|
Attached = false
|
||||||
|
|
||||||
Wait(100)
|
Wait(100)
|
||||||
stopTempCam()
|
stopTempCam()
|
||||||
makeFakeSurfboard(Ped, true, data.prop) -- pick up animation
|
makeFakeSurfboard(Ped, true, data.prop) -- pick up animation
|
||||||
currentToken = triggerCallback(AuthEvent)
|
|
||||||
addItem(lastItem, 1)
|
triggerCallback(getScript()..":auth:collectBoard")
|
||||||
|
|
||||||
skateboard = {}
|
skateboard = {}
|
||||||
Dir = {}
|
Dir = {}
|
||||||
else
|
else
|
||||||
@@ -129,10 +131,9 @@ RegisterNetEvent(getScript()..":Surfboard:PickPlace", function(data)
|
|||||||
storedVariables = skateboard
|
storedVariables = skateboard
|
||||||
SetEntityCoords(skateboard.Bike, GetOffsetFromEntityInWorldCoords(Ped, 0.0, 0.8, 0.0))
|
SetEntityCoords(skateboard.Bike, GetOffsetFromEntityInWorldCoords(Ped, 0.0, 0.8, 0.0))
|
||||||
SetEntityHeading(skateboard.Bike, GetEntityHeading(Ped)+90)
|
SetEntityHeading(skateboard.Bike, GetEntityHeading(Ped)+90)
|
||||||
lastItem = data.name
|
|
||||||
if hasItem(data.name, 1) then
|
triggerCallback(getScript()..":auth:logLastBoard", data.name)
|
||||||
removeItem(data.name, 1)
|
|
||||||
end
|
|
||||||
Dir = {}
|
Dir = {}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -211,9 +212,9 @@ RegisterNetEvent(getScript()..":Surfboard:GetOn", function() local Ped = PlayerP
|
|||||||
removeEntityTarget(skateboard.Bike)
|
removeEntityTarget(skateboard.Bike)
|
||||||
removeEntityTarget(skateboard.Driver)
|
removeEntityTarget(skateboard.Driver)
|
||||||
Attached = false
|
Attached = false
|
||||||
Wait(100)
|
|
||||||
currentToken = triggerCallback(AuthEvent)
|
triggerCallback(getScript()..":auth:collectBoard")
|
||||||
addItem(lastItem, 1)
|
|
||||||
skateboard = {}
|
skateboard = {}
|
||||||
Dir = {}
|
Dir = {}
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -10,4 +10,35 @@ onResourceStart(function()
|
|||||||
TriggerClientEvent(getScript()..":Surfboard:PickPlace", source, { name = k })
|
TriggerClientEvent(getScript()..":Surfboard:PickPlace", source, { name = k })
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local authCheck = {}
|
||||||
|
createCallback(getScript()..":auth:logLastBoard", function(source, item)
|
||||||
|
local src = source
|
||||||
|
if not SkateboardItemModels[item] and not SurfboardItemModels[item] then
|
||||||
|
print("^1Error^7: SRC: "..src.."^1Tried to log an item that wasn't a board^7: "..item)
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
if authCheck[src] then
|
||||||
|
print("^1Error^7: SRC: "..src.." ^1already logged an item^7: "..authCheck[src])
|
||||||
|
return false
|
||||||
|
else
|
||||||
|
authCheck[src] = item
|
||||||
|
removeItem(item, 1, src)
|
||||||
|
debugPrint("^5Debug^7: SRC: "..src.." ^2logged an item^7: "..authCheck[src])
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
createCallback(getScript()..":auth:collectBoard", function(source)
|
||||||
|
local src = source
|
||||||
|
if not authCheck[src] then
|
||||||
|
print("^1Error^7: SRC: "..src.."^1Tried to request an item but it wasn't logged^7")
|
||||||
|
return false
|
||||||
|
else
|
||||||
|
addItem(authCheck[src], 1, nil, src)
|
||||||
|
authCheck[src] = nil
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
end, true)
|
end, true)
|
||||||
|
|||||||
Reference in New Issue
Block a user