diff --git a/gamemodes/irresistible/cnr/features/paintball.pwn b/gamemodes/irresistible/cnr/features/paintball.pwn
index 1b47c9b..459afe8 100644
--- a/gamemodes/irresistible/cnr/features/paintball.pwn
+++ b/gamemodes/irresistible/cnr/features/paintball.pwn
@@ -567,6 +567,9 @@ stock hasPaintBallArena( playerid, &arena = -1 )
 	return false;
 }
 
+stock IsPlayerLeavingPaintball( playerid ) {
+	return p_LeftPaintball{ playerid };
+}
 
 /* ** Commands ** */
 
diff --git a/gamemodes/irresistible/cnr/features/weapon_drop.pwn b/gamemodes/irresistible/cnr/features/weapon_drop.pwn
index d4346dc..2e93b1e 100644
--- a/gamemodes/irresistible/cnr/features/weapon_drop.pwn
+++ b/gamemodes/irresistible/cnr/features/weapon_drop.pwn
@@ -47,7 +47,7 @@ hook OnPlayerDeathEx( playerid, killerid, reason, Float: damage, bodypart )
 hook OnPlayerDeath( playerid, killerid, reason )
 #endif
 {
-	if ( IsPlayerJailed( playerid ) || IsPlayerInPaintBall( playerid ) || IsPlayerInEvent( playerid ) || IsPlayerDueling( playerid ) )
+	if ( IsPlayerJailed( playerid ) || IsPlayerInPaintBall( playerid ) || IsPlayerInEvent( playerid ) || IsPlayerDueling( playerid ) || IsPlayerLeavingPaintball( playerid ) )
 		return 1; // do not break return
 
 	new Float: X, Float: Y, Float: Z;