From 28a0672489a9cce375f5caf8e1b372b677363e8e Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Sat, 20 Sep 2014 20:01:44 -0300
Subject: Fixed Bug 7894

default battleground icon on non-allies is now visible!
Special Thanks to kyeme.
http://hercules.ws/board/tracker/issue-7894-battlegrounds-emblem-and-guardian/

Signed-off-by: shennetsind <ind@henn.et>
---
 src/map/clif.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/map/clif.c b/src/map/clif.c
index 9fec0bc66..f673e0970 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17706,8 +17706,8 @@ void clif_maptypeproperty2(struct block_list *bl,enum send_target t) {
 	p.PacketType = maptypeproperty2Type;
 	p.type = 0x28;
 	p.flag.party = map->list[bl->m].flag.pvp ? 1 : 0;
-	p.flag.guild = map_flag_gvg(bl->m) ? 1 : 0;
-	p.flag.siege = map_flag_gvg2(bl->m) ? 1: 0;
+	p.flag.guild = (map->list[bl->m].flag.battleground || map_flag_gvg(bl->m)) ? 1 : 0;
+	p.flag.siege = (map->list[bl->m].flag.battleground || map_flag_gvg2(bl->m)) ? 1: 0;
 	p.flag.mineffect = map_flag_gvg(bl->m); // FIXME/CHECKME Forcing /mineffect in castles during WoE (probably redundant? I'm not sure)
 	p.flag.nolockon = 0; // TODO
 	p.flag.countpk = map->list[bl->m].flag.pvp ? 1 : 0;
-- 
cgit v1.2.3-70-g09d2