diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-26 21:27:12 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-26 21:27:12 +0000 |
| commit | 071be58854f037749f5ec160f1a0d50fc41b78eb (patch) | |
| tree | 08a389d812e1ad88b84dd9638e2a155c5d948f9a /src/map/unit.c | |
| parent | b4b0462ea9eac4718cae3efc099579dcd14f2eed (diff) | |
| download | hercules-071be58854f037749f5ec160f1a0d50fc41b78eb.tar.gz hercules-071be58854f037749f5ec160f1a0d50fc41b78eb.tar.bz2 hercules-071be58854f037749f5ec160f1a0d50fc41b78eb.tar.xz hercules-071be58854f037749f5ec160f1a0d50fc41b78eb.zip | |
- Fixed item Nemesis.
- Fixed Tarot Card being used on Emperium.
- First Part of BattleGround Implementation (please wait).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13550 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 7260930fe..dce211fc9 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -20,6 +20,7 @@ #include "guild.h" #include "status.h" #include "battle.h" +#include "battleground.h" #include "chat.h" #include "trade.h" #include "vending.h" @@ -1585,7 +1586,7 @@ int unit_skillcastcancel(struct block_list *bl,int type) return 0; if (sd && (sd->special_state.no_castcancel2 || - (sd->special_state.no_castcancel && !map_flag_gvg(bl->m)))) //fixed flags being read the wrong way around [blackhole89] + (sd->special_state.no_castcancel && !map_flag_gvg(bl->m) && !map[bl->m].flag.battleground))) //fixed flags being read the wrong way around [blackhole89] return 0; } @@ -1792,6 +1793,7 @@ int unit_remove_map_(struct block_list *bl, int clrtype, const char* file, int l } party_send_dot_remove(sd);//minimap dot fix [Kevin] guild_send_dot_remove(sd); + bg_send_dot_remove(sd); if( map[bl->m].users <= 0 || sd->state.debug_remove_map ) {// this is only place where map users is decreased, if the mobs were removed too soon then this function was executed too many times [FlavioJS] |