UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed BanClient always banning by IP address (bug 4626, r=fyren).

Browse Source
This commit is contained in:
Nicholas Hastings 2010-11-30 13:09:30 -05:00
parent 20d14d5a10
commit 5b806a467b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/logic/smn_banning.cpp
View File

@ -269,9 +269,14 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
ban_flags = params[3]; ban_flags = params[3];
ban_source = params[7]; ban_source = params[7];
#if SOURCE_ENGINE != SE_DARKMESSIAH
/* Check how we should ban the player */ /* Check how we should ban the player */
if ((ban_flags & BANFLAG_AUTO) == BANFLAG_AUTO) if (!strcmp(smcore.GetSourceEngineName(), "darkmessiah"))
{
/* Dark Messiah doesn't have Steam IDs so there is only one ban method to choose */
ban_flags |= BANFLAG_IP;
ban_flags &= ~BANFLAG_AUTHID;
}
else if ((ban_flags & BANFLAG_AUTO) == BANFLAG_AUTO)
{ {
if (gamehelpers->IsLANServer() || !pPlayer->IsAuthorized()) if (gamehelpers->IsLANServer() || !pPlayer->IsAuthorized())
{ {
@ -305,11 +310,6 @@ static cell_t BanClient(IPluginContext *pContext, const cell_t *params)
{ {
return pContext->ThrowNativeError("No valid ban method flags specified"); return pContext->ThrowNativeError("No valid ban method flags specified");
} }
#else
/* Dark Messiah doesn't have Steam IDs so there is only one ban method to choose */
ban_flags |= BANFLAG_IP;
ban_flags &= ~BANFLAG_AUTHID;
#endif
cell_t handled = 0; cell_t handled = 0;
if (ban_cmd[0] != '\0' && g_pOnBanClient->GetFunctionCount() > 0) if (ban_cmd[0] != '\0' && g_pOnBanClient->GetFunctionCount() > 0)