Merge pull request #31 from meCloudy/patch-11

Fixes K/D in event
This commit is contained in:
Lorenc Pekaj 2019-06-09 19:17:49 +10:00 committed by GitHub
commit 704c6a08ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1292,7 +1292,7 @@ public OnPlayerDeath( playerid, killerid, reason )
//DCC_SendChannelMessageFormatted( discordGeneralChan, "*%s(%d) has killed %s(%d) - %s!*", ReturnPlayerName( killerid ), killerid, ReturnPlayerName( playerid ), playerid, ReturnWeaponName( reason ) ); //DCC_SendChannelMessageFormatted( discordGeneralChan, "*%s(%d) has killed %s(%d) - %s!*", ReturnPlayerName( killerid ), killerid, ReturnPlayerName( playerid ), playerid, ReturnWeaponName( reason ) );
if ( !IsPlayerAdminOnDuty( killerid ) ) if ( !IsPlayerAdminOnDuty( killerid ) && ! IsPlayerInEvent( killerid ) )
{ {
new new
killerGangId = p_GangID[ killerid ]; killerGangId = p_GangID[ killerid ];
@ -1440,7 +1440,7 @@ public OnPlayerDeath( playerid, killerid, reason )
DeletePVar( playerid, "used_cmd_kill" ); DeletePVar( playerid, "used_cmd_kill" );
} }
if ( ! IsPlayerInPaintBall( playerid ) && !p_LeftPaintball{ playerid } && !IsPlayerAdminOnDuty( playerid ) ) if ( ! IsPlayerInPaintBall( playerid ) && !p_LeftPaintball{ playerid } && ! IsPlayerAdminOnDuty( playerid ) && ! IsPlayerInEvent( playerid ) )
{ {
if ( playerGangId != INVALID_GANG_ID ) if ( playerGangId != INVALID_GANG_ID )
SaveGangData( playerGangId ), g_gangData[ playerGangId ] [ E_DEATHS ]++; SaveGangData( playerGangId ), g_gangData[ playerGangId ] [ E_DEATHS ]++;