From d67c0dd4f78b1a1a6aae9e54791bd93daea5904f Mon Sep 17 00:00:00 2001
From: momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 23 Nov 2012 03:37:38 +0000
Subject: Follow up to r16946, where not all npc interactions (input, menu)
 where properly terminated. *Buddha of mine I also horrendously misplaced the
 code.*

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16949 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/pc.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/map/pc.c')

diff --git a/src/map/pc.c b/src/map/pc.c
index b73a633d8..6f85aa532 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6493,6 +6493,19 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 		if( (bg = bg_team_search(sd->bg_id)) != NULL && bg->die_event[0] )
 			npc_event(sd, bg->die_event, 0);
 	}
+	
+	// Clear anything NPC-related when you die and was interacting with one.
+	if (sd->npc_id)
+	{
+		if (sd->state.using_fake_npc)
+			sd->state.using_fake_npc = 0;
+		if (sd->state.menu_or_input)
+			sd->state.menu_or_input = 0;
+		if (sd->npc_menu)
+			sd->npc_menu = 0;
+	 
+		npc_event_dequeue(sd);
+	}
 
 	npc_script_event(sd,NPCE_DIE);
 
-- 
cgit v1.2.3-70-g09d2