From 1711d9e803b126c7863eef26691318592faafbf0 Mon Sep 17 00:00:00 2001
From: ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 17 Dec 2010 23:41:02 +0000
Subject: * Fixed a crash, when script command 'doevent' is called without an
 attached player (bugreport:3973).

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

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

diff --git a/src/map/script.c b/src/map/script.c
index 04cb0593b..3da635bf5 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7848,8 +7848,15 @@ BUILDIN_FUNC(clone)
 BUILDIN_FUNC(doevent)
 {
 	const char* event = script_getstr(st,2);
+	struct map_session_data* sd;
+
+	if( ( sd = script_rid2sd(st) ) == NULL )
+	{
+		return 0;
+	}
+
 	check_event(st, event);
-	npc_event(map_id2sd(st->rid),event,0);
+	npc_event(sd, event, 0);
 	return 0;
 }
 /*==========================================
-- 
cgit v1.2.3-60-g2f50