summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-20 04:23:40 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-20 04:23:40 +0000
commit89e3488e045e9d6b7718773ff843b2a1e3f6e2a0 (patch)
tree03bf11692edf5f040729f526d1dc74c9f4408877
parentb057932ea2c1577cfdf6e8e3b3a3f4241736988d (diff)
downloadhercules-89e3488e045e9d6b7718773ff843b2a1e3f6e2a0.tar.gz
hercules-89e3488e045e9d6b7718773ff843b2a1e3f6e2a0.tar.bz2
hercules-89e3488e045e9d6b7718773ff843b2a1e3f6e2a0.tar.xz
hercules-89e3488e045e9d6b7718773ff843b2a1e3f6e2a0.zip
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
-rw-r--r--src/map/unit.c2
1 files changed, 1 insertions, 1 deletions
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;