From 16e4fc6942deaaa3493114a6c7c99341667066a9 Mon Sep 17 00:00:00 2001 From: Damen Date: Sun, 14 Apr 2019 12:43:59 -0400 Subject: [PATCH 1/2] changes 'xp' in static MOTD to 'vehicles' --- gamemodes/irresistible/cnr/textdraws.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/irresistible/cnr/textdraws.pwn b/gamemodes/irresistible/cnr/textdraws.pwn index 5baa95f..4b9f49f 100644 --- a/gamemodes/irresistible/cnr/textdraws.pwn +++ b/gamemodes/irresistible/cnr/textdraws.pwn @@ -135,7 +135,7 @@ hook OnScriptInit( ) TextDrawColor(g_MotdTD, -1); TextDrawSetOutline(g_MotdTD, 1); TextDrawSetProportional(g_MotdTD, 1); - TextDrawSetString( g_MotdTD, "~w~Want more ~g~money~w~, ~r~houses~w~, and ~b~xp~w~? Consider donating! ~y~/vip" ); + TextDrawSetString( g_MotdTD, "~w~Want more ~g~money~w~, ~r~houses~w~, and ~b~vehicles~w~? Consider donating! ~y~/vip" ); g_ObjectLoadTD = TextDrawCreate(320.000000, 148.000000, "Loading Objects...~n~Please Wait..."); TextDrawAlignment(g_ObjectLoadTD, 2); From a58221cd0f646cc07228b571d981755ee5d93a28 Mon Sep 17 00:00:00 2001 From: Damen Date: Sun, 14 Apr 2019 13:03:52 -0400 Subject: [PATCH 2/2] attempts to fix dropoff kicking, again --- gamemodes/irresistible/cnr/features/cop/jail.pwn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gamemodes/irresistible/cnr/features/cop/jail.pwn b/gamemodes/irresistible/cnr/features/cop/jail.pwn index 8ff6a60..c74e681 100644 --- a/gamemodes/irresistible/cnr/features/cop/jail.pwn +++ b/gamemodes/irresistible/cnr/features/cop/jail.pwn @@ -51,7 +51,12 @@ hook OnScriptInit( ) } hook OnPlayerEnterDynamicCP( playerid, checkpointid ) { - if ( IsPlayerJailed( playerid ) ) { + if ( IsPlayerJailed( playerid ) && checkpointid != ( g_Checkpoints[ CP_DROP_OFF_COP ] || + g_Checkpoints[ CP_DROP_OFF_FC ] || g_Checkpoints[ CP_DROP_OFF_DILLIMORE ] || + g_Checkpoints[ CP_DROP_OFF_DIABLO ] || g_Checkpoints[ CP_DROP_OFF_QUBRADOS ] || + g_Checkpoints[ CP_DROP_OFF_COP_LS ] || g_Checkpoints[ CP_DROP_OFF_FBI_LS ] || + g_Checkpoints[ CP_DROP_OFF_FBI_LV ] || g_Checkpoints[ CP_DROP_OFF_COP_LV ] || + g_Checkpoints[ CP_DROP_OFF_FBI ] || g_Checkpoints[ CP_DROP_OFF_HELI ] ) ) { return SendError( playerid, "You're jailed, and you accessed a checkpoint. I smell a cheater." ), KickPlayerTimed( playerid ), Y_HOOKS_BREAK_RETURN_1; } return 1;