fix cloudy merge potential issue
This commit is contained in:
parent
e2a3744b3e
commit
33de4b0722
@ -268,7 +268,6 @@ stock JailPlayer( playerid, seconds, admin = 0 )
|
|||||||
RemovePlayerStolensFromHands( playerid );
|
RemovePlayerStolensFromHands( playerid );
|
||||||
StopPlayerUsingSlotMachine ( playerid );
|
StopPlayerUsingSlotMachine ( playerid );
|
||||||
RemoveEquippedOre ( playerid );
|
RemoveEquippedOre ( playerid );
|
||||||
RemovePlayerFromEvent ( playerid, true );
|
|
||||||
ClearPlayerWantedLevel ( playerid );
|
ClearPlayerWantedLevel ( playerid );
|
||||||
ResetPlayerWeapons ( playerid );
|
ResetPlayerWeapons ( playerid );
|
||||||
UntiePlayer ( playerid );
|
UntiePlayer ( playerid );
|
||||||
@ -276,6 +275,10 @@ stock JailPlayer( playerid, seconds, admin = 0 )
|
|||||||
SetPlayerPosToPrison ( playerid );
|
SetPlayerPosToPrison ( playerid );
|
||||||
Player_CheckPokerGame ( playerid, "Jailed" );
|
Player_CheckPokerGame ( playerid, "Jailed" );
|
||||||
|
|
||||||
|
#if defined __cloudy_event_system
|
||||||
|
RemovePlayerFromEvent ( playerid, true );
|
||||||
|
#endif
|
||||||
|
|
||||||
// External Functions
|
// External Functions
|
||||||
SetPlayerSpecialAction ( playerid, SPECIAL_ACTION_NONE );
|
SetPlayerSpecialAction ( playerid, SPECIAL_ACTION_NONE );
|
||||||
ClearAnimations ( playerid );
|
ClearAnimations ( playerid );
|
||||||
|
Loading…
Reference in New Issue
Block a user