source/sourcemod
1
0
Fork 0
mirror of https://github.com/alliedmodders/sourcemod.git synced 2025-12-07 02:18:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge ef7c201cc8 into 1819f491b5

Browse Source
This commit is contained in:
Kyle Sanderson 2025-11-25 22:54:20 +08:00 committed by GitHub
commit 2864ff364a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/PlayerManager.cpp
View File

@ -1560,12 +1560,25 @@ int PlayerManager::InternalFilterCommandTarget(CPlayer *pAdmin, CPlayer *pTarget
if (pAdmin != NULL) if (pAdmin != NULL)
{ {
if ((flags & COMMAND_FILTER_NO_IMMUNITY) != COMMAND_FILTER_NO_IMMUNITY if ((flags & COMMAND_FILTER_NO_IMMUNITY) != COMMAND_FILTER_NO_IMMUNITY)
&& !adminsys->CanAdminTarget(pAdmin->GetAdminId(), pTarget->GetAdminId())) {
AdminId tid = pTarget->GetAdminId();
/* If the target is pre-auth they're targetable; bypassing immunity rules... */
if (tid == INVALID_ADMIN_ID && !pTarget->IsAuthStringValidated())
{
tid = adminsys->FindAdminByIdentity("steam", pTarget->GetAuthString(false));
if (tid == INVALID_ADMIN_ID)
{
tid = adminsys->FindAdminByIdentity("ip", pTarget->GetIPAddress());
}
}
if (!adminsys->CanAdminTarget(pAdmin->GetAdminId(), tid))
{ {
return COMMAND_TARGET_IMMUNE; return COMMAND_TARGET_IMMUNE;
} }
} }
}
if ((flags & COMMAND_FILTER_ALIVE) == COMMAND_FILTER_ALIVE if ((flags & COMMAND_FILTER_ALIVE) == COMMAND_FILTER_ALIVE
&& pTarget->GetLifeState() != PLAYER_LIFE_ALIVE) && pTarget->GetLifeState() != PLAYER_LIFE_ALIVE)