summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 380a57095..682158408 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8330,13 +8330,11 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
if(sd->status.guild_id)
guild_send_memberinfoshort(sd,1);
- // pvp
- //if(sd->pvp_timer!=-1 && !battle_config.pk_mode) /PVP Client crash fix* Removed timer deletion
- // delete_timer(sd->pvp_timer,pc_calc_pvprank_timer);
if(map[sd->bl.m].flag.pvp){
if(!battle_config.pk_mode) { // remove pvp stuff for pk_mode [Valaris]
- if (sd->pvp_timer == -1)
- sd->pvp_timer=add_timer(gettick()+200,pc_calc_pvprank_timer,sd->bl.id,0);
+ if (!map[sd->bl.m].flag.pvp_nocalcrank)
+ sd->pvp_timer= add_timer(gettick()+200,
+ pc_calc_pvprank_timer,sd->bl.id,0);
sd->pvp_rank=0;
sd->pvp_lastusers=0;
sd->pvp_point=5;