From 797848cc6647ae1dd682fae3749b7adf80a5fa21 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 20 Dec 2006 00:44:52 +0000
Subject: - Fixed SC_STRIPWEAPON failing on two-handed weapons. - Minor
 changes.

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

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

diff --git a/src/map/script.c b/src/map/script.c
index dca64002c..3edcbaf92 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7204,6 +7204,14 @@ int buildin_getnpctimer(struct script_state *st)
 		nd=npc_name2id(conv_str(st,& (st->stack->stack_data[st->start+3])));
 	else
 		nd=(struct npc_data *)map_id2bl(st->oid);
+	
+	if (!nd || nd->bl.type != BL_NPC)
+	{
+		push_val(st->stack,C_INT,0);
+		if (battle_config.error_log)
+			ShowError("getnpctimer: Invalid NPC\n");
+		return 1;
+	}
 
 	switch(type){
 	case 0: val=npc_gettimerevent_tick(nd); break;
-- 
cgit v1.2.3-70-g09d2