From 887a260a6e638ef5281f6619ff6c1019f26412bd Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Sat, 30 May 2020 23:33:41 +0200 Subject: Make mineffect flag not being affected by sd->state.lesseffect in clif_maptypeproperty2() --- src/map/clif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/clif.c b/src/map/clif.c index a0ec1fdf6..b7eacd4a2 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -20439,7 +20439,7 @@ static void clif_maptypeproperty2(struct block_list *bl, enum send_target t) p.flag.party = map->list[bl->m].flag.pvp ? 1 : 0; //PARTY p.flag.guild = (map->list[bl->m].flag.battleground || map_flag_gvg(bl->m)) ? 1 : 0; // GUILD p.flag.siege = (map->list[bl->m].flag.battleground || map_flag_gvg2(bl->m)) ? 1: 0; // SIEGE - p.flag.mineffect = map_flag_gvg(bl->m) ? 1 : ( (sd && sd->state.lesseffect) ? 1 : 0); // USE_SIMPLE_EFFECT - Forcing /mineffect in castles during WoE (probably redundant? I'm not sure) + p.flag.mineffect = map_flag_gvg2(bl->m) ? 1 : 0; // USE_SIMPLE_EFFECT - Automatically enable /mineffect in guild arenas and castles. p.flag.nolockon = 0; // DISABLE_LOCKON - TODO p.flag.countpk = map->list[bl->m].flag.pvp ? 1 : 0; // COUNT_PK p.flag.nopartyformation = map->list[bl->m].flag.partylock ? 1 : 0; // NO_PARTY_FORMATION -- cgit v1.2.3-70-g09d2 From 95920e3c8744b6311dc10cbd704f4888f5150b9c Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Sat, 30 May 2020 23:36:11 +0200 Subject: Removed unused variable sd from clif_maptypeproperty2() --- src/map/clif.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/map/clif.c b/src/map/clif.c index b7eacd4a2..634e2bae0 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -20429,11 +20429,8 @@ static void clif_maptypeproperty2(struct block_list *bl, enum send_target t) { #if PACKETVER >= 20121010 struct packet_maptypeproperty2 p; - struct map_session_data *sd = NULL; nullpo_retv(bl); - sd = BL_CAST(BL_PC, bl); - p.PacketType = maptypeproperty2Type; p.type = 0x28; p.flag.party = map->list[bl->m].flag.pvp ? 1 : 0; //PARTY -- cgit v1.2.3-70-g09d2