ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix spawn bug with infinite health + allow vip plat to have 2 jobs

Browse Source
This commit is contained in:
Lorenc Pekaj 2018-11-24 04:15:37 +11:00
parent 688d5b9a3f
commit 455b728258
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gamemodes/irresistible/cnr/features/gangs/turfs.pwn
View File

@ -389,7 +389,7 @@ public OnPlayerUpdateGangZone( playerid, zoneid )
if ( g_gangTurfData[ g_gangHardpointTurf ] [ E_ID ] != g_gangTurfData[ zoneid ] [ E_ID ] ) { 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" ); PlayerTextDrawSetString( playerid, g_ZoneOwnerTD[ playerid ], "~b~~h~(INACTIVE HARDPOINT)~n~~w~~h~Unchallenged" );
} else { } 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" ) ) ); PlayerTextDrawSetString( playerid, g_ZoneOwnerTD[ playerid ], sprintf( "~r~~h~(ACTIVE HARDPOINT)~n~~w~~h~%s", g_gangHardpointAttacker != INVALID_GANG_ID ? ( ReturnGangName( g_gangHardpointAttacker ) ) : ( "Unchallenged" ) ) );
} }
} }

14
gamemodes/sf-cnr.pwn
View File

@ -3813,8 +3813,8 @@ CMD:vipjob( playerid, params[ ] )
if ( p_VIPLevel[ playerid ] < VIP_REGULAR ) 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" ); 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 ) if ( p_VIPLevel[ playerid ] < VIP_PLATINUM )
return SendError( playerid, "This command requires you to be Diamond V.I.P." ); return SendError( playerid, "This command requires you to be Platinum V.I.P." );
if ( isnull( params ) ) if ( isnull( params ) )
return SendUsage( playerid, "/vipjob [PART OF JOB NAME]" ); return SendUsage( playerid, "/vipjob [PART OF JOB NAME]" );
@ -4090,10 +4090,10 @@ CMD:myaccid( playerid, params[ ] )
CMD:job( 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 } ) ); 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 } ) ); 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 } ) ); 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 ); 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 ); SetPlayerHealth( playerid, p_AdminOnDuty{ playerid } ? float( INVALID_PLAYER_ID ) : 100.0 );
}
DisableRemoteVehicleCollisions( playerid, p_AdminOnDuty{ playerid } ); DisableRemoteVehicleCollisions( playerid, p_AdminOnDuty{ playerid } );
Delete3DTextLabel( p_SpawnKillLabel[ playerid ] ); Delete3DTextLabel( p_SpawnKillLabel[ playerid ] );
p_SpawnKillLabel[ playerid ] = Text3D: INVALID_3DTEXT_ID; p_SpawnKillLabel[ playerid ] = Text3D: INVALID_3DTEXT_ID;