Ignores "quit to avoid" if player is in event

This commit is contained in:
Cloudy 2019-06-02 14:44:36 +03:00 committed by GitHub
parent 5de5f6bf34
commit ea2cda97d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -845,8 +845,12 @@ public OnPlayerWeaponShot( playerid, weaponid, hittype, hitid, Float: fX, Float:
return 1; // fcnpc
// Cop shoots innocent, they /q - so jail
#if defined __cloudy_event_system
if ( p_Class[ playerid ] == CLASS_POLICE && p_WantedLevel[ hitid ] > 2 && ! IsPlayerInEvent( playerid ) && ! IsPlayerInEvent( hitid ) )
#else
if ( p_Class[ playerid ] == CLASS_POLICE && p_WantedLevel[ hitid ] > 2 )
p_QuitToAvoidTimestamp[ hitid ] = g_iTime + 3;
#endif
if ( p_Class[ playerid ] == CLASS_POLICE && p_Class[ hitid ] != CLASS_POLICE && !p_WantedLevel[ hitid ] && GetPlayerState( hitid ) != PLAYER_STATE_WASTED && ! IsPlayerInEvent( playerid ) && ! IsPlayerInBattleRoyale( playerid ) )
return ShowPlayerHelpDialog( playerid, 2000, "You cannot hurt innocent civilians, you're a ~b~cop~w~~h~!" ), 0;