diff options
| author | Haru <haru@dotalux.com> | 2020-06-01 05:03:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 05:03:44 +0200 |
| commit | f0aef9c8d8278b593b9de86148417c2aee78ab54 (patch) | |
| tree | b36246a622dc0975de88fb9316ab52fa76cdfa1f /src/map | |
| parent | fa52d380f2d58140da037f2b3fa959902abe39dc (diff) | |
| parent | 95920e3c8744b6311dc10cbd704f4888f5150b9c (diff) | |
| download | hercules-f0aef9c8d8278b593b9de86148417c2aee78ab54.tar.gz hercules-f0aef9c8d8278b593b9de86148417c2aee78ab54.tar.bz2 hercules-f0aef9c8d8278b593b9de86148417c2aee78ab54.tar.xz hercules-f0aef9c8d8278b593b9de86148417c2aee78ab54.zip | |
Merge pull request #2754 from Kenpachi2k13/mineffect_flag
Make mineffect flag not being affected by sd->state.lesseffect in clif_maptypeproperty2()
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 409889f90..5cc11c494 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -20453,17 +20453,14 @@ 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 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 |