diff options
| author | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 06:12:53 +0000 |
|---|---|---|
| committer | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-05 06:12:53 +0000 |
| commit | 13e152b1a9819d6587c9702b7eccd174e62b5e8b (patch) | |
| tree | cd4bab826c21854a257078b00dd22d22adc83367 /src/map/unit.c | |
| parent | 1b1edc7ad6115f6823a6cf1e341277a8cb86a00b (diff) | |
| download | hercules-13e152b1a9819d6587c9702b7eccd174e62b5e8b.tar.gz hercules-13e152b1a9819d6587c9702b7eccd174e62b5e8b.tar.bz2 hercules-13e152b1a9819d6587c9702b7eccd174e62b5e8b.tar.xz hercules-13e152b1a9819d6587c9702b7eccd174e62b5e8b.zip | |
- Re-committed r16979/trunk/src/ (pid:161281).
- Re-committed r16980/trunk/src/ (pid:161281).
- Malufett enhancement applied (bugreport:16981)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16998 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 4827c0c68..51da8ef24 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -766,7 +766,7 @@ int unit_warp(struct block_list *bl,short m,short x,short y,clr_type type) case BL_MOB: 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) + if (m != bl->m && map[m].flag.nobranch && battle_config.mob_warp&4 && !(((TBL_MOB *)bl)->master_id)) return 1; break; case BL_PC: |