- Now gvg_dungeon mapflag will activate the other mapflags which are required: pvp, pvp_nocalcrank and pvp_noparty/pvp_noguild (they are forced to off if gvg_dungeon is on and viceversa)

- Cleaned the pvp ranking code so that it takes effect even if pvp_nocalcrank is active WHEN the map is a gvg_dungeon one.
- Cleaned up a bit the pvp ranking timer code.
- Now homuncs and their masters are the only ones who can use support skills on the homunc.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9360 54d463be-8e91-2dee-dedb-b68131a5f0ec

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;