From 199d7734d5a221f4d6088d3c9d9e39395cf267e8 Mon Sep 17 00:00:00 2001 From: Damen Date: Sun, 27 Jan 2019 18:22:06 -0500 Subject: [PATCH 1/2] hotfixes for arresting and dropweapon --- gamemodes/irresistible/cnr/features/cop/arrest.pwn | 2 +- gamemodes/irresistible/cnr/features/weapon_drop.pwn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/cop/arrest.pwn b/gamemodes/irresistible/cnr/features/cop/arrest.pwn index 913aeac..43bdeff 100644 --- a/gamemodes/irresistible/cnr/features/cop/arrest.pwn +++ b/gamemodes/irresistible/cnr/features/cop/arrest.pwn @@ -493,7 +493,7 @@ function BreakPlayerCuffsAttempt( playerid ) return BreakPlayerCuffs( playerid ) stock AwardNearestLEO( playerid, reason ) { - if ( ! IsPlayerConnected( playerid ) || playerid == INVALID_PLAYER_ID ) + if ( ! IsPlayerConnected( playerid ) || playerid == INVALID_PLAYER_ID || GetPlayerWantedLevel( playerid ) < 2 ) return false; new diff --git a/gamemodes/irresistible/cnr/features/weapon_drop.pwn b/gamemodes/irresistible/cnr/features/weapon_drop.pwn index 6ae8f4f..a8b0968 100644 --- a/gamemodes/irresistible/cnr/features/weapon_drop.pwn +++ b/gamemodes/irresistible/cnr/features/weapon_drop.pwn @@ -432,7 +432,7 @@ stock RemoveSpecificPlayerWeapon( playerid, weaponid, bool:createpickup ) GetPlayerWeaponData( playerid, iSlot, iWeaponID[ iSlot ], iWeaponAmmo[ iSlot ] ); } - if ( createpickup ) + if ( createpickup && iCurrentWeapon == iWeapon ) { new Float: X, Float: Y, Float: Z; From 76b49ebe4bb21cfd05af00311809c150c80699f6 Mon Sep 17 00:00:00 2001 From: Damen Date: Sun, 27 Jan 2019 19:41:13 -0500 Subject: [PATCH 2/2] comments out migration file --- gamemodes/irresistible/config/_config.pwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamemodes/irresistible/config/_config.pwn b/gamemodes/irresistible/config/_config.pwn index ace2af2..23a48a6 100644 --- a/gamemodes/irresistible/config/_config.pwn +++ b/gamemodes/irresistible/config/_config.pwn @@ -11,4 +11,4 @@ #include "irresistible\config\colors.pwn" /* ** Migrations Manager ** */ -#include "irresistible\config\migrations\_migrations.pwn" +//#include "irresistible\config\migrations\_migrations.pwn"