diff --git a/gamemodes/irresistible/cnr/features/animations.pwn b/gamemodes/irresistible/cnr/features/animations.pwn index fa5cb13..0395be9 100644 --- a/gamemodes/irresistible/cnr/features/animations.pwn +++ b/gamemodes/irresistible/cnr/features/animations.pwn @@ -362,6 +362,7 @@ stock CreateLoopingAnimation( playerid, animlib[ ], animname[ ], Float:Speed, lo else if ( IsPlayerAttachedObjectSlotUsed( playerid, 3 ) ) return SendError( playerid, "You cannot use this command since you're holding a stolen good." ); else if ( GetPlayerState( playerid ) == PLAYER_STATE_ENTER_VEHICLE_DRIVER || GetPlayerState( playerid ) == PLAYER_STATE_ENTER_VEHICLE_PASSENGER ) return SendError( playerid, "You cannot use this command since you're entering a vehicle." ); else if ( GetPlayerState( playerid ) == PLAYER_STATE_EXIT_VEHICLE ) return SendError( playerid, "You cannot use this command since you're exiting a vehicle." ); + else if ( IsPlayerWearingParachute( playerid ) ) return SendError( playerid, "You cannot use this command while wearing a parachute." ); else { SetPlayerSpecialAction( playerid, 0 ); @@ -397,3 +398,12 @@ stock IsPlayingAnimation( playerid, const library[ ], const animation[ ] ) stock IsPlayerUsingAnimation( playerid ) { return p_InAnimation{ playerid }; } + + +stock IsPlayerWearingParachute( playerid ) +{ + if ( GetPlayerWeapon( playerid ) == 46 ) + return true; + else + return false; +} \ No newline at end of file diff --git a/gamemodes/irresistible/cnr/features/car_jacker.pwn b/gamemodes/irresistible/cnr/features/car_jacker.pwn index 57cff05..f183fa6 100644 --- a/gamemodes/irresistible/cnr/features/car_jacker.pwn +++ b/gamemodes/irresistible/cnr/features/car_jacker.pwn @@ -42,6 +42,12 @@ hook OnScriptInit( ) return 1; } +hook OnPlayerConnect( playerid ) +{ + p_AntiExportCarSpam [ playerid ] = g_iTime + 60; + return 1; +} + hook OnPlayerDisconnect( playerid, reason ) { g_LastExportModel[ playerid ] = 0; diff --git a/gamemodes/irresistible/cnr/features/vip/coin_generation.pwn b/gamemodes/irresistible/cnr/features/vip/coin_generation.pwn index fc770c3..8fb37f6 100644 --- a/gamemodes/irresistible/cnr/features/vip/coin_generation.pwn +++ b/gamemodes/irresistible/cnr/features/vip/coin_generation.pwn @@ -55,7 +55,7 @@ hook OnPlayerTickSecond( playerid ) iKeys, iUpDownKeys, iLeftRightKeys; // Increase Irresistible Coins (1/20 = cred/min) - if ( ! IsPlayerAFK( playerid ) && GetPlayerKeys( playerid, iKeys, iUpDownKeys, iLeftRightKeys ) && ! IsPlayerOnRoulette( playerid ) && ! IsPlayerOnSlotMachine( playerid ) && GetPlayerVehicleSeat( playerid ) <= 0 ) + if ( ! IsPlayerAFK( playerid ) && GetPlayerKeys( playerid, iKeys, iUpDownKeys, iLeftRightKeys ) && ! IsPlayerOnRoulette( playerid ) && ! IsPlayerOnSlotMachine( playerid ) && GetPlayerVehicleSeat( playerid ) <= 0 && !IsPlayerUsingAnimation( playerid ) ) { if ( iKeys != 0 || iUpDownKeys != 0 || iLeftRightKeys != 0 ) { // GetPlayerScore( playerid ) > 10 && diff --git a/gamemodes/irresistible/cnr/features/vip/coin_market.pwn b/gamemodes/irresistible/cnr/features/vip/coin_market.pwn index fce31d5..b40adf2 100644 --- a/gamemodes/irresistible/cnr/features/vip/coin_market.pwn +++ b/gamemodes/irresistible/cnr/features/vip/coin_market.pwn @@ -501,7 +501,7 @@ CMD:irresistiblecoins( playerid, params[ ] ) else if ( senttoid == playerid ) return SendError( playerid, "You cannot send yourself coins." ); else { - if ( GetDistanceBetweenPlayers( playerid, senttoid ) > 8.0 ) + if ( GetDistanceBetweenPlayers( playerid, senttoid ) > 8.0 || p_Spectating{ senttoid } ) return SendError( playerid, "Please make sure you are close to the player before sending coins to them." ); format( szNormalString, sizeof( szNormalString ), "INSERT INTO `TRANSACTIONS_IC` (`TO_ID`, `FROM_ID`, `IC`) VALUES (%d, %d, %f)", p_AccountID[ senttoid ], p_AccountID[ playerid ], coins ); diff --git a/gamemodes/irresistible/cnr/features/weed.pwn b/gamemodes/irresistible/cnr/features/weed.pwn index 6d814ce..ebf07c0 100644 --- a/gamemodes/irresistible/cnr/features/weed.pwn +++ b/gamemodes/irresistible/cnr/features/weed.pwn @@ -329,7 +329,6 @@ stock Weed_GetPlantLimit( playerid ) stock Weed_ResetSellingProperties( playerid ) { - Weed_ResetSellingProperties( playerid ); p_WeedSellingGrams[ playerid ] = 0; p_WeedSellingPrice[ playerid ] = 0; return 1; diff --git a/gamemodes/irresistible/config/migrations/_migrations.pwn b/gamemodes/irresistible/config/migrations/_migrations.pwn index de1239d..e49ebad 100644 --- a/gamemodes/irresistible/config/migrations/_migrations.pwn +++ b/gamemodes/irresistible/config/migrations/_migrations.pwn @@ -55,7 +55,7 @@ public Migrations_CheckMissing( ) new num_migrations = Migrations_GetCount( ); - if ( executed_migrations != num_migrations ) + if ( executed_migrations < num_migrations ) { new dir: migrations_directory = dir_open( SERVER_MIGRATIONS_FOLDER ),