From 89e3488e045e9d6b7718773ff843b2a1e3f6e2a0 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Tue, 20 Dec 2011 04:23:40 +0000 Subject: slaves are now able to teleport to their master even on monster_noteleport flags, bugreport:4030 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15171 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index a13305d96..80dcc8e55 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -754,7 +754,7 @@ int unit_warp(struct block_list *bl,short m,short x,short y,clr_type type) switch (bl->type) { case BL_MOB: - if (map[bl->m].flag.monster_noteleport) + if (map[bl->m].flag.monster_noteleport && ((TBL_MOB*)bl)->master_id == 0) return 1; if (m != bl->m && map[m].flag.nobranch && battle_config.mob_warp&4) return 1; -- cgit v1.2.3-60-g2f50