From 33de4b0722d8da67bda4c9768c13e71037187d61 Mon Sep 17 00:00:00 2001
From: Lorenc Pekaj <zeelorenc@hotmail.com>
Date: Fri, 31 May 2019 19:24:56 +1000
Subject: [PATCH] fix cloudy merge potential issue

---
 gamemodes/irresistible/cnr/features/cop/jail.pwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gamemodes/irresistible/cnr/features/cop/jail.pwn b/gamemodes/irresistible/cnr/features/cop/jail.pwn
index 6c27297..ef4976b 100644
--- a/gamemodes/irresistible/cnr/features/cop/jail.pwn
+++ b/gamemodes/irresistible/cnr/features/cop/jail.pwn
@@ -268,7 +268,6 @@ stock JailPlayer( playerid, seconds, admin = 0 )
 	RemovePlayerStolensFromHands( playerid );
 	StopPlayerUsingSlotMachine 	( playerid );
 	RemoveEquippedOre			( playerid );
-	RemovePlayerFromEvent		( playerid, true );
 	ClearPlayerWantedLevel 		( playerid );
     ResetPlayerWeapons			( playerid );
 	UntiePlayer					( playerid );
@@ -276,6 +275,10 @@ stock JailPlayer( playerid, seconds, admin = 0 )
 	SetPlayerPosToPrison 		( playerid );
 	Player_CheckPokerGame 		( playerid, "Jailed" );
 
+	#if defined __cloudy_event_system
+	RemovePlayerFromEvent		( playerid, true );
+	#endif
+
 	// External Functions
 	SetPlayerSpecialAction		( playerid, SPECIAL_ACTION_NONE );
 	ClearAnimations 			( playerid );