- Corrected Musical Strike having a different damage equation from Throw Arrow.

- Some minor cleanup of Soul Change 
- Added state rewarp to players. It gets set when a pc_setpos call is triggered while the player is changing maps so that when the player finish loading the map, it is inmediately rewarped to where it has been rewarped/recalled to.


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

1 files changed, 10 insertions, 5 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 6521dca6c..30e0c1cd1 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1754,9 +1754,6 @@ int clif_changemap(struct map_session_data *sd, short map, int x, int y) {
 	WFIFOW(fd,20) = y;

 	WFIFOSET(fd, packet_len_table[0x91]);

 

-	if(pc_isdead(sd)) // If player is dead, and is spawned (such as @refresh) send death packet. [Valaris]

-		clif_clearchar_area(&sd->bl,1);

-

 	return 0;

 }

 

@@ -8061,6 +8058,13 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 	

 	if(sd->bl.prev != NULL)

 		return;

+		

+	if (sd->state.rewarp)

+  	{	//Rewarp player.

+		sd->state.rewarp = 0;

+		clif_changemap(sd,sd->mapindex,sd->bl.x,sd->bl.y);

+		return;

+	}

 

 	if(sd->npc_id) npc_event_dequeue(sd);

 

@@ -8240,8 +8244,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 	else

 		sd->areanpc_id = 0;

 

-	if (pc_isdead(sd)) //In case you warped dead.

-		clif_clearchar_area(&sd->bl, 1);

+  	// If player is dead, and is spawned (such as @refresh) send death packet. [Valaris]

+	if(pc_isdead(sd))

+		clif_clearchar_area(&sd->bl,1);

 }

 

 /*==========================================