summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 4d6fdc29f..52284d83d 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -173,7 +173,11 @@ static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data)
return 0;
} else
sd->areanpc_id=0;
- if (sd->state.gmaster_flag)
+ if (sd->state.gmaster_flag &&
+ (battle_config.guild_aura&(agit_flag?2:1)) &&
+ (battle_config.guild_aura&
+ (map[bl->m].flag.gvg || map[bl->m].flag.gvg_castle?8:4))
+ )
{ //Guild Aura: Likely needs to be recoded, this method seems inefficient.
struct guild *g = sd->state.gmaster_flag;
int skill, strvit= 0, agidex = 0;