summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorepoque11 <epoque11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-13 02:21:13 +0000
committerepoque11 <epoque11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-13 02:21:13 +0000
commit0fe7b873ae06352aba2840eacf687d270d64fc2d (patch)
tree391d8d79f1ee00049a5421a6e2dc473a3d8d062a /src/map/clif.c
parent1e5059abe076709eed3a5044c6980c6a7615aece (diff)
downloadhercules-0fe7b873ae06352aba2840eacf687d270d64fc2d.tar.gz
hercules-0fe7b873ae06352aba2840eacf687d270d64fc2d.tar.bz2
hercules-0fe7b873ae06352aba2840eacf687d270d64fc2d.tar.xz
hercules-0fe7b873ae06352aba2840eacf687d270d64fc2d.zip
- Fixed hidden GMs being processed in the PVP ranking timer
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15083 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 75c00187e..eab61ca4e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8661,6 +8661,10 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
if( map[sd->bl.m].users++ == 0 && battle_config.dynamic_mobs )
map_spawnmobs(sd->bl.m);
+ if( !(sd->sc.option&OPTION_INVISIBLE) )
+ {// increment the number of pvp players on the map
+ map[sd->bl.m].users_pvp++;
+ }
if( map[sd->bl.m].instance_id )
{
instance[map[sd->bl.m].instance_id].users++;
@@ -8680,7 +8684,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
if( sd->bg_id ) clif_bg_hp(sd); // BattleGround System
- if(map[sd->bl.m].flag.pvp) {
+ if(map[sd->bl.m].flag.pvp && !(sd->sc.option&OPTION_INVISIBLE)) {
if(!battle_config.pk_mode) { // remove pvp stuff for pk_mode [Valaris]
if (!map[sd->bl.m].flag.pvp_nocalcrank)
sd->pvp_timer = add_timer(gettick()+200, pc_calc_pvprank_timer, sd->bl.id, 0);