Skip to content

Add eventName to onPlayerTriggerEventThreshold #4271

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

Merged
merged 3 commits into from
Jul 1, 2025
Merged

Add eventName to onPlayerTriggerEventThreshold #4271

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7b5ed9
Update CGame.cpp
ColombuxMaximus Jun 29, 2025
8a95e40
Update CGame.h
ColombuxMaximus Jun 29, 2025
b3f8559
Update CGame.cpp
ColombuxMaximus Jul 1, 2025
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
21 changes: 15 additions & 6 deletions Server/mods/deathmatch/logic/CGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,7 +1641,7 @@ void CGame::AddBuiltInEvents()
m_Events.AddEvent("onPlayerResourceStart", "resource", NULL, false);
m_Events.AddEvent("onPlayerProjectileCreation", "weaponType, posX, posY, posZ, force, target, rotX, rotY, rotZ, velX, velY, velZ", nullptr, false);
m_Events.AddEvent("onPlayerDetonateSatchels", "", nullptr, false);
m_Events.AddEvent("onPlayerTriggerEventThreshold", "", nullptr, false);
m_Events.AddEvent("onPlayerTriggerEventThreshold", "eventName", nullptr, false);
m_Events.AddEvent("onPlayerTeamChange", "oldTeam, newTeam", nullptr, false);
m_Events.AddEvent("onPlayerTriggerInvalidEvent", "eventName, isAdded, isRemote", nullptr, false);
m_Events.AddEvent("onPlayerChangesProtectedData", "element, key, value", nullptr, false);
Expand Down Expand Up @@ -2680,7 +2680,7 @@ void CGame::Packet_LuaEvent(CLuaEventPacket& Packet)
m_pScriptDebugging->LogError(NULL, "Client (%s) triggered serverside event %s, but event is not added serverside", pCaller->GetNick(), szName);
}

RegisterClientTriggeredEventUsage(pCaller);
RegisterClientTriggeredEventUsage(pCaller, szName);
}
}

Expand Down Expand Up @@ -4982,7 +4982,7 @@ void CGame::HandleCrashDumpEncryption()
#endif
}

void CGame::RegisterClientTriggeredEventUsage(CPlayer* pPlayer)
void CGame::RegisterClientTriggeredEventUsage(CPlayer* pPlayer, const char* szEventName)
{
if (!pPlayer || !pPlayer->IsPlayer() || pPlayer->IsBeingDeleted())
return;
Expand All @@ -4994,8 +4994,13 @@ void CGame::RegisterClientTriggeredEventUsage(CPlayer* pPlayer)
m_mapClientTriggeredEvents[pPlayer].m_llTicks = now;

// Only increment if we haven't reached the interval time already
if (now - m_mapClientTriggeredEvents[pPlayer].m_llTicks <= m_iClientTriggeredEventsIntervalMs)
m_mapClientTriggeredEvents[pPlayer].m_uiCounter++;
ClientTriggeredEventsInfo& info = m_mapClientTriggeredEvents[pPlayer];

if (now - info.m_llTicks <= m_iClientTriggeredEventsIntervalMs)
info.m_uiCounter++;

if (szEventName)
info.m_strLastEventName = szEventName;
}

void CGame::ProcessClientTriggeredEventSpam()
Expand All @@ -5010,7 +5015,11 @@ void CGame::ProcessClientTriggeredEventSpam()
if (GetTickCount64_() - data.m_llTicks >= m_iClientTriggeredEventsIntervalMs)
{
if (data.m_uiCounter > m_iMaxClientTriggeredEventsPerInterval)
player->CallEvent("onPlayerTriggerEventThreshold", {});
{
CLuaArguments args;
args.PushString(data.m_strLastEventName.c_str());
player->CallEvent("onPlayerTriggerEventThreshold", args);
}

remove = true;
}
Expand Down
3 changes: 2 additions & 1 deletion Server/mods/deathmatch/logic/CGame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ class CGame
static void PlayerCompleteConnect(CPlayer* pPlayer);

void ProcessClientTriggeredEventSpam();
void RegisterClientTriggeredEventUsage(CPlayer* pPlayer);
void RegisterClientTriggeredEventUsage(CPlayer* pPlayer, const char* szEventName);

// Technically, this could be put somewhere else. It's a callback function
// which the voice server library will call to send out data.
Expand Down Expand Up @@ -687,6 +687,7 @@ class CGame
{
long long m_llTicks = 0;
uint32_t m_uiCounter = 0;
std::string m_strLastEventName;
};

std::map<CPlayer*, ClientTriggeredEventsInfo> m_mapClientTriggeredEvents;
Expand Down
Loading