Skip to content

update admin chat to match old sourcemod behaviour #370

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
Frozen-H2O merged 1 commit into from
Jul 27, 2025
Merged

update admin chat to match old sourcemod behaviour #370

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion configs/admins.jsonc.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
//
// // If at least 1 group is added above, these are all optional fields.
// "flags": "abcdefg", // Permission flags. Combines with any flags defined in user's groups
// "immunity": "1" // Non-negative value. Takes highest value from here or any of user's groups
// "immunity": 1 // Non-negative value. Takes highest value from here or any of user's groups
//}
}
}
7 changes: 3 additions & 4 deletions src/cs2fixes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@ void CS2Fixes::Hook_DispatchConCommand(ConCommandRef cmdHandle, const CCommandCo
auto pController = CCSPlayerController::FromSlot(iCommandPlayerSlot);
bool bGagged = pController && pController->GetZEPlayer()->IsGagged();
bool bFlooding = pController && pController->GetZEPlayer()->IsFlooding();
bool bIsAdmin = pController && pController->GetZEPlayer()->IsAdminFlagSet(ADMFLAG_GENERIC);
bool bAdminChat = bTeamSay && *args[1] == '@';
bool bSilent = *args[1] == '/' || bAdminChat;
bool bCommand = *args[1] == '!' || *args[1] == '/';
Expand Down Expand Up @@ -575,10 +576,8 @@ void CS2Fixes::Hook_DispatchConCommand(ConCommandRef cmdHandle, const CCommandCo
if (!pPlayer)
continue;

if (pPlayer->IsAdminFlagSet(ADMFLAG_GENERIC))
ClientPrint(CCSPlayerController::FromSlot(i), HUD_PRINTTALK, " \4(ADMINS) %s:\1 %s", pController->GetPlayerName(), pszMessage);
else if (i == iCommandPlayerSlot.Get()) // Sender is not an admin
ClientPrint(pController, HUD_PRINTTALK, " \4(TO ADMINS) %s:\1 %s", pController->GetPlayerName(), pszMessage);
if (i == iCommandPlayerSlot.Get() || pPlayer->IsAdminFlagSet(ADMFLAG_GENERIC))
ClientPrint(CCSPlayerController::FromSlot(i), HUD_PRINTTALK, " \4(%sADMINS) %s:\6 %s", bIsAdmin ? "" : "TO ", pController->GetPlayerName(), pszMessage);
}
}

Expand Down