From e4847c600ebccbfbfcc9b37e797924aaac224c11 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 6 Mar 2006 14:54:40 +0000
Subject: - Fixed npc_event doing a map-check when the npc is not on any map.

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

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

diff --git a/src/map/npc.c b/src/map/npc.c
index a8765995e..184b56eea 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -822,7 +822,7 @@ int npc_event (struct map_session_data *sd, const unsigned char *eventname, int
 	xs=nd->u.scr.xs;
 	ys=nd->u.scr.ys;
 	if (xs>=0 && ys>=0 && (strcmp(((eventname)+strlen(eventname)-6),"Global") != 0) )        {
-		if (nd->bl.m != sd->bl.m )
+		if (nd->bl.m >= 0 && nd->bl.m != sd->bl.m )
 			return 1;
 		if ( xs>0 && (sd->bl.x<nd->bl.x-xs/2 || nd->bl.x+xs/2<sd->bl.x) )
 			return 1;
-- 
cgit v1.2.3-70-g09d2