diff options
| author | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-29 08:26:44 +0000 |
|---|---|---|
| committer | markzd <markzd@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-29 08:26:44 +0000 |
| commit | 25db581cb0a540c7264f28ad086d0963cc8f4f40 (patch) | |
| tree | a7bf4efe9c1e1a736c0593924298c5d8957f77b7 /src/map/unit.c | |
| parent | 92edc3c1a3fff932737a1922aede941388912648 (diff) | |
| download | hercules-25db581cb0a540c7264f28ad086d0963cc8f4f40.tar.gz hercules-25db581cb0a540c7264f28ad086d0963cc8f4f40.tar.bz2 hercules-25db581cb0a540c7264f28ad086d0963cc8f4f40.tar.xz hercules-25db581cb0a540c7264f28ad086d0963cc8f4f40.zip | |
* Fixed (assistant/slave)summons/clone, where they dissappeared when going up to a nobranch mapflag map. (bugreport:6925)
* Minor fix to to Nosiege, follow up (r16969)
* Fixed RK_Refresh where it was not removing/protecting from the right debuffs.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16979 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 5781c3c24..016e8cdd8 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -744,7 +744,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: |