From b2fe6cf38bf248cb640464c9da383536d75445af Mon Sep 17 00:00:00 2001
From: rubin <rubinserhiy@gmail.com>
Date: Wed, 19 Oct 2022 21:32:56 +0300
Subject: [PATCH] add event on trailer delete

---
 TruckHUD.lua | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/TruckHUD.lua b/TruckHUD.lua
index 997cea9..377b6c8 100755
--- a/TruckHUD.lua
+++ b/TruckHUD.lua
@@ -2034,15 +2034,12 @@ end
 
 function loadEvents()
 
-    function sampev.onVehicleSync(vehicleId, data)
-        lua_thread.create(luChecker.vehicleSync, vehicleId, data)
+    function sampev.onVehicleSync(playerId, vehicleId, data)
+        lua_thread.create(luChecker.vehicleSync, playerId, vehicleId, data)
     end
     function sampev.onTrailerSync(playerId, data)
         lua_thread.create(luChecker.trailerSync, playerId, data)
     end
-    function sampev.onVehicleStreamIn(vehicleId, data)
-        lua_thread.create(luChecker.vehicleStream, true, vehicleId, data)
-    end
     function sampev.onVehicleStreamOut(vehicleId)
         lua_thread.create(luChecker.vehicleStream, false, vehicleId)
     end
@@ -2174,6 +2171,7 @@ function loadEvents()
         antiflood = os.clock() * 1000
     end
     function sampev.onVehicleStreamIn(vehicleId, data)
+        lua_thread.create(luChecker.vehicleStream, true, vehicleId, data)
         if inifiles ~= nil and not inifiles.Settings.Tuning and (data.type == 403 or data.type == 515) then
             data.modSlots[8] = 0
             return {vehicleId, data}
@@ -2754,7 +2752,7 @@ function loadEvents()
 end
 
 function say(text)
-    sampAddChatMessage(text,-1)
+    sampAddChatMessage(tostring(text),-1)
 end
 
 function write_table_log(key, param, Log)
@@ -3980,7 +3978,7 @@ function isVehicleTruckersDelete(table, vehicleId)
     local playerId = -1
     local isTrailer = false
     for k,v in pairs(table) do
-        if v["trailerData"].vehicleId == vehicleId then
+        if v["trailerData"].trailerId == vehicleId then
             result = true
             playerId = k
             isTrailer = true
@@ -4001,19 +3999,27 @@ function luChecker.vehicleStream(stream, vehicleId, data)
     else
         local result, playerId, isTrailer = isVehicleTruckersDelete(luChecker.truckers, vehicleId)
         if result then
+            if isTrailer then
+                say("Трейлер игрока удален")
+            else
+                say("Машина игрока удалена")
+            end
             luChecker.truckers[playerId] = nil
         end
         luChecker.vehicles[vehicleId] = nil
     end
 end
 
-function luChecker.vehicleSync(vehicleId, data)
-    if not isPlayerHaveTruckHUD(data.playerId) then
-        if luChecker.vehicles[vehicleId] ~= nil and (luChecker.vehicles[vehicleId].type == 403 or luChecker.vehicles[vehicleId].type == 514 or luChecker.vehicles[vehicleId].type == 515) then 
-            luChecker.truckers[data.playerId] = data
-            luChecker.truckers[data.playerId]["trailerData"] = {
-                trailerId = -1
-            }
+function luChecker.vehicleSync(playerId, vehicleId, data)
+    if luChecker.vehicles[vehicleId] ~= nil and not isPlayerHaveTruckHUD(playerId) then
+        if luChecker.vehicles[vehicleId] ~= nil and (luChecker.vehicles[vehicleId].type == 403 or luChecker.vehicles[vehicleId].type == 514 or luChecker.vehicles[vehicleId].type == 515) then
+            luChecker.truckers[playerId] = data
+            luChecker.truckers[playerId]["vehicleId"] = vehicleId
+            if luChecker.truckers[playerId]["trailerData"] == nil then
+                luChecker.truckers[playerId]["trailerData"] = {
+                    trailerId = -1
+                }
+            end
         end
     end
 end