From 1fae8bcda4bc0969e4a03a842f10ef4b5a6bddf5 Mon Sep 17 00:00:00 2001
From: momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 23 Nov 2012 01:10:36 +0000
Subject: [PATCH] Fixed bugreport:2313 where a player interacting with a NPC
 would still be queued when died and therefore causing problems with further
 NPC interactions.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16946 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/status.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/map/status.c b/src/map/status.c
index 5fae9350fe..9e3b642d64 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1343,6 +1343,9 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
 		clif_clearunit_area(target,CLR_DEAD);
 		skill_unit_move(target,gettick(),4);
 		skill_cleartimerskill(target);
+		
+		if(target->type == BL_PC && ((TBL_PC*)target)->npc_id && flag == 1)
+			npc_event_dequeue((TBL_PC*)target);
 	}
 
 	return hp+sp;