Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into cleanup/storages_optimization

Browse Source
This commit is contained in:
Cydh Ramdh
2016-10-14 06:12:52 +07:00
parent 768d801f3d b2c4178209
commit 748035141b
20 changed files with 204 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/atcommand.c
View File

@@ -1619,7 +1619,6 @@ ACMD_FUNC(pvpoff)
if (!battle_config.pk_mode){
clif_map_property_mapall(sd->bl.m, MAPPROPERTY_NOTHING);
clif_maptypeproperty2(&sd->bl,ALL_SAMEMAP);
}
map_foreachinmap(atcommand_pvpoff_sub,sd->bl.m, BL_PC);
map_foreachinmap(atcommand_stopattack,sd->bl.m, BL_CHAR, 0);
@@ -1657,7 +1656,6 @@ ACMD_FUNC(pvpon)
if (!battle_config.pk_mode) {// display pvp circle and rank
clif_map_property_mapall(sd->bl.m, MAPPROPERTY_FREEPVPZONE);
clif_maptypeproperty2(&sd->bl,ALL_SAMEMAP);
map_foreachinmap(atcommand_pvpon_sub,sd->bl.m, BL_PC);
}
@@ -1680,7 +1678,6 @@ ACMD_FUNC(gvgoff)
map[sd->bl.m].flag.gvg = 0;
clif_map_property_mapall(sd->bl.m, MAPPROPERTY_NOTHING);
clif_maptypeproperty2(&sd->bl,ALL_SAMEMAP);
map_foreachinmap(atcommand_stopattack,sd->bl.m, BL_CHAR, 0);
clif_displaymessage(fd, msg_txt(sd,33)); // GvG: Off.
@@ -1701,7 +1698,6 @@ ACMD_FUNC(gvgon)
map[sd->bl.m].flag.gvg = 1;
clif_map_property_mapall(sd->bl.m, MAPPROPERTY_AGITZONE);
clif_maptypeproperty2(&sd->bl,ALL_SAMEMAP);
clif_displaymessage(fd, msg_txt(sd,34)); // GvG: On.
return 0;
@@ -9549,8 +9545,6 @@ ACMD_FUNC(vip) {
pl_sd->vip.time += vipdifftime; //increase or reduce VIP duration
if (pl_sd->vip.time <= now) {
pl_sd->vip.time = 0;
pl_sd->vip.enabled = 0;
clif_displaymessage(pl_sd->fd, msg_txt(pl_sd,703)); // GM has removed your VIP time.
clif_displaymessage(fd, msg_txt(sd,704)); // Player is no longer VIP.
} else {