Michatec/wk_wars2x
1
1
Fork 0
mirror of https://github.com/Michatec/wk_wars2x.git synced 2026-04-01 00:16:27 +02:00
Code Issues Packages Projects Releases Activity

feat(sync): only trigger sync on enter if passenger view allowed

Browse Source
This commit is contained in:
Dan
2021-03-19 14:08:23 +00:00
parent 989d4050b1
commit 338f3bb243
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cl_player.lua
View File

@@ -111,7 +111,7 @@ end )
Citizen.CreateThread( function() Citizen.CreateThread( function()
while ( true ) do while ( true ) do
-- The sync trigger should only start when the player is getting into a vehicle -- The sync trigger should only start when the player is getting into a vehicle
if ( IsPedGettingIntoAVehicle( PLY.ped ) ) then if ( IsPedGettingIntoAVehicle( PLY.ped ) and RADAR:IsPassengerViewAllowed() ) then
-- Get the vehicle the player is entering -- Get the vehicle the player is entering
local vehEntering = GetVehiclePedIsEntering( PLY.ped ) local vehEntering = GetVehiclePedIsEntering( PLY.ped )

24
cl_sync.lua
View File

@@ -349,20 +349,18 @@ function SYNC:SyncDataOnEnter()
-- Make sure passenger view is allowed, also, using PLY:IsPassenger() already checks that the player's -- Make sure passenger view is allowed, also, using PLY:IsPassenger() already checks that the player's
-- vehicle meets the requirements of what the radar requires. This way we don't have to do additional -- vehicle meets the requirements of what the radar requires. This way we don't have to do additional
-- checks manually. -- checks manually.
if ( RADAR:IsPassengerViewAllowed() ) then if ( PLY:IsPassenger() ) then
if ( PLY:IsPassenger() ) then local driver = PLY:GetOtherPedServerId()
local driver = PLY:GetOtherPedServerId()
-- Only trigger the event if there is actually a driver -- Only trigger the event if there is actually a driver
if ( driver ~= nil ) then if ( driver ~= nil ) then
TriggerServerEvent( "wk_wars2x_sync:requestRadarData", driver ) TriggerServerEvent( "wk_wars2x_sync:requestRadarData", driver )
end end
elseif ( PLY:IsDriver() ) then elseif ( PLY:IsDriver() ) then
if ( RADAR:IsThereBackupData() ) then if ( RADAR:IsThereBackupData() ) then
-- Restore the local data -- Restore the local data
RADAR:RestoreFromBackup() RADAR:RestoreFromBackup()
READER:RestoreFromBackup() READER:RestoreFromBackup()
end
end end
end end
end end