summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-07 14:02:13 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-07 14:02:13 +0000
commit6a393f19e5e814126ca51a9e94b89a03066250b4 (patch)
tree4eba085d3cc19491802327630fc1f7bf7916b859
parentbda4ddd3612d2ba0d6abf62bb2ccf4c9f3b33e2b (diff)
downloadhercules-6a393f19e5e814126ca51a9e94b89a03066250b4.tar.gz
hercules-6a393f19e5e814126ca51a9e94b89a03066250b4.tar.bz2
hercules-6a393f19e5e814126ca51a9e94b89a03066250b4.tar.xz
hercules-6a393f19e5e814126ca51a9e94b89a03066250b4.zip
- Modified the error on the char-sql server to set chars online when it receives a save packet from a character tagged as offline.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7561 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/char_sql/char.c9
2 files changed, 10 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 94b16da51..3ff38b420 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/07
+ * Modified the error on the char-sql server to set chars online when it
+ receives a save packet from a character tagged as offline (until it can be
+ figured out why this is happening) [Skotlex]
* Fixed signed/unsigned comparison issues in the char txt/sql server.
[Skotlex]
* Fixed the cooking success chances. Thanks to Ishizu Chan. [Skotlex]
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 58fa10784..7c031bf16 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -2595,11 +2595,16 @@ int parse_frommap(int fd) {
if (
(character = idb_get(online_char_db, aid)) != NULL &&
character->char_id == cid)
+ ; //Temporary debug. Set chars online and save.
+ else {
+ ShowWarning("parse_from_map (save-char): Received data for non-existant/offline character (%d:%d). Setting char online.\n", aid, cid);
+ set_char_online(id, cid, aid);
+ }
+
{
memcpy(&char_dat, RFIFOP(fd,13), sizeof(struct mmo_charstatus));
mmo_char_tosql(cid, &char_dat);
- } else
- ShowError("parse_from_map (save-char): Received data for non-existant/offline character (%d:%d)!\n", aid, cid);
+ }
if (RFIFOB(fd,12)) //Flag? Set character offline after saving [Skotlex]
set_char_offline(cid, aid);