From 455b7282582d9eea8203ba5b2b3745bf15e3e394 Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Sat, 24 Nov 2018 04:15:37 +1100 Subject: [PATCH] fix spawn bug with infinite health + allow vip plat to have 2 jobs --- .../irresistible/cnr/features/gangs/turfs.pwn | 2 +- gamemodes/sf-cnr.pwn | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/gangs/turfs.pwn b/gamemodes/irresistible/cnr/features/gangs/turfs.pwn index 74f38fe..92e21ba 100644 --- a/gamemodes/irresistible/cnr/features/gangs/turfs.pwn +++ b/gamemodes/irresistible/cnr/features/gangs/turfs.pwn @@ -389,7 +389,7 @@ public OnPlayerUpdateGangZone( playerid, zoneid ) if ( g_gangTurfData[ g_gangHardpointTurf ] [ E_ID ] != g_gangTurfData[ zoneid ] [ E_ID ] ) { PlayerTextDrawSetString( playerid, g_ZoneOwnerTD[ playerid ], "~b~~h~(INACTIVE HARDPOINT)~n~~w~~h~Unchallenged" ); } else { - DisablePlayerSpawnProtection( playerid, true ); + DisablePlayerSpawnProtection( playerid, false ); PlayerTextDrawSetString( playerid, g_ZoneOwnerTD[ playerid ], sprintf( "~r~~h~(ACTIVE HARDPOINT)~n~~w~~h~%s", g_gangHardpointAttacker != INVALID_GANG_ID ? ( ReturnGangName( g_gangHardpointAttacker ) ) : ( "Unchallenged" ) ) ); } } diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn index 1e78900..fd4b642 100644 --- a/gamemodes/sf-cnr.pwn +++ b/gamemodes/sf-cnr.pwn @@ -3813,8 +3813,8 @@ CMD:vipjob( playerid, params[ ] ) if ( p_VIPLevel[ playerid ] < VIP_REGULAR ) return SendError( playerid, "You are not a V.I.P, to become one visit "COL_GREY"donate.sfcnr.com" ); - if ( p_VIPLevel[ playerid ] < VIP_DIAMOND ) - return SendError( playerid, "This command requires you to be Diamond V.I.P." ); + if ( p_VIPLevel[ playerid ] < VIP_PLATINUM ) + return SendError( playerid, "This command requires you to be Platinum V.I.P." ); if ( isnull( params ) ) return SendUsage( playerid, "/vipjob [PART OF JOB NAME]" ); @@ -4090,10 +4090,10 @@ CMD:myaccid( playerid, params[ ] ) CMD:job( playerid, params[ ] ) { - if ( p_VIPLevel[ playerid ] >= VIP_DIAMOND && p_VIPJob{ playerid } != p_Job{ playerid } ) + if ( p_VIPLevel[ playerid ] >= VIP_PLATINUM && p_VIPJob{ playerid } != p_Job{ playerid } ) return SendServerMessage( playerid, "Your jobs are "COL_GOLD"%s"COL_WHITE" and "COL_GOLD"%s"COL_WHITE".", GetJobName( p_Job{ playerid } ), GetJobName( p_VIPJob{ playerid } ) ); - if ( p_VIPLevel[ playerid ] >= VIP_DIAMOND && p_VIPJob{ playerid } == p_Job{ playerid } ) + if ( p_VIPLevel[ playerid ] >= VIP_PLATINUM && p_VIPJob{ playerid } == p_Job{ playerid } ) return SendServerMessage( playerid, "Your jobs are "COL_GOLD"%s"COL_WHITE" and your VIP job is disabled.", GetJobName( p_Job{ playerid } ) ); SendServerMessage( playerid, "Your job is a "COL_GOLD"%s"COL_WHITE".", GetJobName( p_Job{ playerid } ) ); @@ -12735,11 +12735,11 @@ stock IsPlayerInMinigame( playerid ) { return IsPlayerInPaintBall( playerid ) || IsPlayerDueling( playerid ) || IsPlayerPlayingPool( playerid ) || IsPlayerPlayingPoker( playerid ); } -stock DisablePlayerSpawnProtection( playerid, bool: restore_health = false ) +stock DisablePlayerSpawnProtection( playerid, bool: restore_health = true ) { - if ( restore_health ) + if ( restore_health ) { SetPlayerHealth( playerid, p_AdminOnDuty{ playerid } ? float( INVALID_PLAYER_ID ) : 100.0 ); - + } DisableRemoteVehicleCollisions( playerid, p_AdminOnDuty{ playerid } ); Delete3DTextLabel( p_SpawnKillLabel[ playerid ] ); p_SpawnKillLabel[ playerid ] = Text3D: INVALID_3DTEXT_ID;