summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/char_sql/char.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5350caf68..19854d755 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/02/01
+ * Fixed sql charserver crashing sometimes (bugreport:870) [ultramage]
2008/01/29
* Plagiarize can no longer copy skill levels beyond their max skill_db
value.
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 30e33f011..50f72718e 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -1896,7 +1896,7 @@ int parse_fromlogin(int fd)
int aid = RFIFOL(fd,2);
if ((character = idb_get(online_char_db, aid)) != NULL)
{ //Kick out this player.
- if( character->server != -1 )
+ if( character->server > -1 )
{ //Kick it from the map server it is on.
mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
if (character->waiting_disconnect == -1)