Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add onPlayerTriggerInvalidEvent #3400

Merged
merged 1 commit into from
May 24, 2024
Merged

Add onPlayerTriggerInvalidEvent #3400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions Server/mods/deathmatch/logic/CGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1592,6 +1592,7 @@ void CGame::AddBuiltInEvents()
m_Events.AddEvent("onPlayerDetonateSatchels", "", nullptr, false);
m_Events.AddEvent("onPlayerTriggerEventThreshold", "", nullptr, false);
m_Events.AddEvent("onPlayerTeamChange", "oldTeam, newTeam", nullptr, false);
m_Events.AddEvent("onPlayerTriggerInvalidEvent", "eventName, isAdded, isRemote", nullptr, false);

// Ped events
m_Events.AddEvent("onPedVehicleEnter", "vehicle, seat, jacked", NULL, false);
Expand Down Expand Up @@ -2574,11 +2575,26 @@ void CGame::Packet_LuaEvent(CLuaEventPacket& Packet)
pElement->CallEvent(szName, *pArguments, pCaller);
}
else
{
CLuaArguments arguments;
arguments.PushString(szName);
arguments.PushBoolean(true);
arguments.PushBoolean(false);
pCaller->CallEvent("onPlayerTriggerInvalidEvent", arguments);
m_pScriptDebugging->LogError(NULL, "Client (%s) triggered serverside event %s, but event is not marked as remotely triggerable",
pCaller->GetNick(), szName);
}

}
else
m_pScriptDebugging->LogError(NULL, "Client (%s) triggered serverside event %s, but event is not added serverside", pCaller->GetNick(), szName);
else
{
CLuaArguments arguments;
arguments.PushString(szName);
arguments.PushBoolean(false);
arguments.PushBoolean(false);
pCaller->CallEvent("onPlayerTriggerInvalidEvent", arguments);
m_pScriptDebugging->LogError(NULL, "Client (%s) triggered serverside event %s, but event is not added serverside", pCaller->GetNick(), szName);
}

RegisterClientTriggeredEventUsage(pCaller);
}
Expand Down
Loading