From bfb2086e0586bcd2413f9afb42464bc62996f792 Mon Sep 17 00:00:00 2001 From: SaltySnail Date: Thu, 13 Jun 2024 23:00:52 +0200 Subject: [PATCH] fix all other places where onVehicleDeleted isn't triggered after a delete packet is sent --- src/LuaAPI.cpp | 1 + src/TServer.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/LuaAPI.cpp b/src/LuaAPI.cpp index 015f4bf..bc8c94f 100644 --- a/src/LuaAPI.cpp +++ b/src/LuaAPI.cpp @@ -217,6 +217,7 @@ std::pair LuaAPI::MP::RemoveVehicle(int PID, int VID) { auto c = MaybeClient.value().lock(); if (!c->GetCarData(VID).empty()) { std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID); + LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", PID, VID)); Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true); c->DeleteCar(VID); Result.first = true; diff --git a/src/TServer.cpp b/src/TServer.cpp index 22e7c53..2e37eb1 100644 --- a/src/TServer.cpp +++ b/src/TServer.cpp @@ -322,6 +322,7 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ // TODO: handle } std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(CarID); + //LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), CarID)); //uncomment if this packet is sent to everyone instead of to the client that spawned too many vehicles if (!Network.Respond(c, StringToVector(Destroy), true)) { // TODO: handle } @@ -355,6 +356,7 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ } std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(VID); Network.SendToAll(nullptr, StringToVector(Destroy), true, true); + LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), VID)); c.DeleteCar(VID); } }