- Okay, added a chrif_save_ack packet to the char-server so now the map server will know once a character was "final saved", and only then the character will be removed from memory. On char-server reconnection, all chars that are in final-save state are resent to save (if they are still in memory, it's because the ack hasn't gotten here from the char-server). This should effectively block all dupe problems due to heavy inter-server lag, however as it's untested, it currently prints some debug messages when people are saved and then removed from memory. Need testers so this can be debugged and merged to stable!

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

1 files changed, 7 insertions, 1 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 1556c10a3..a0d34e14e 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2752,8 +2752,14 @@ int parse_frommap(int fd) {
 			}

 			if (i != char_num)

 				memcpy(&char_dat[i].status, RFIFOP(fd,13), sizeof(struct mmo_charstatus));

-			if (RFIFOB(fd,12)) //Flag, set character offline. [Skotlex]

+			if (RFIFOB(fd,12))

+			{	//Flag, set character offline. [Skotlex]

 				set_char_offline(RFIFOL(fd,8),RFIFOL(fd,4));

+				WFIFOW(fd, 0) = 0x2b21; //Save ack only needed on final save.

+				WFIFOL(fd, 2) = RFIFOL(fd,4);

+				WFIFOL(fd, 6) = RFIFOL(fd,8);

+				WFIFOSET(fd, 10);

+			}

 			RFIFOSKIP(fd,RFIFOW(fd,2));

 			break;