@@ -1592,6 +1592,7 @@ void CGame::AddBuiltInEvents()
15921592 m_Events.AddEvent (" onPlayerDetonateSatchels" , " " , nullptr , false );
15931593 m_Events.AddEvent (" onPlayerTriggerEventThreshold" , " " , nullptr , false );
15941594 m_Events.AddEvent (" onPlayerTeamChange" , " oldTeam, newTeam" , nullptr , false );
1595+ m_Events.AddEvent (" onPlayerTriggerInvalidEvent" , " eventName, isAdded, isRemote" , nullptr , false );
15951596
15961597 // Ped events
15971598 m_Events.AddEvent (" onPedVehicleEnter" , " vehicle, seat, jacked" , NULL , false );
@@ -2574,11 +2575,26 @@ void CGame::Packet_LuaEvent(CLuaEventPacket& Packet)
25742575 pElement->CallEvent (szName, *pArguments, pCaller);
25752576 }
25762577 else
2578+ {
2579+ CLuaArguments arguments;
2580+ arguments.PushString (szName);
2581+ arguments.PushBoolean (true );
2582+ arguments.PushBoolean (false );
2583+ pCaller->CallEvent (" onPlayerTriggerInvalidEvent" , arguments);
25772584 m_pScriptDebugging->LogError (NULL , " Client (%s) triggered serverside event %s, but event is not marked as remotely triggerable" ,
25782585 pCaller->GetNick (), szName);
2586+ }
2587+
25792588 }
2580- else
2581- m_pScriptDebugging->LogError (NULL , " Client (%s) triggered serverside event %s, but event is not added serverside" , pCaller->GetNick (), szName);
2589+ else
2590+ {
2591+ CLuaArguments arguments;
2592+ arguments.PushString (szName);
2593+ arguments.PushBoolean (false );
2594+ arguments.PushBoolean (false );
2595+ pCaller->CallEvent (" onPlayerTriggerInvalidEvent" , arguments);
2596+ m_pScriptDebugging->LogError (NULL , " Client (%s) triggered serverside event %s, but event is not added serverside" , pCaller->GetNick (), szName);
2597+ }
25822598
25832599 RegisterClientTriggeredEventUsage (pCaller);
25842600 }
0 commit comments