diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-12 03:40:18 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-12 03:40:18 +0000 |
| commit | 00b9732977d9bdc0708d21b0cfd4a5c1794176fc (patch) | |
| tree | 008747ee87ac7b68da500bbd74bbb0ff5c914b2a | |
| parent | df465e487ceca690ecae9854b76693a3d9358fa4 (diff) | |
| download | hercules-00b9732977d9bdc0708d21b0cfd4a5c1794176fc.tar.gz hercules-00b9732977d9bdc0708d21b0cfd4a5c1794176fc.tar.bz2 hercules-00b9732977d9bdc0708d21b0cfd4a5c1794176fc.tar.xz hercules-00b9732977d9bdc0708d21b0cfd4a5c1794176fc.zip | |
- Fixed autotrading characters not being able to reconnect. Seams like I misunderstood how id_db and pc_db are used.
Ref: http://www.eathena.ws/board/index.php?showtopic=131873
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9644 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/clif.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 8ae79e8e2..8eba24a8c 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ 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. +2007/01/12 + * Fixed autotrading characters not being able to reconnect. Seams like I + misunderstood how id_db and pc_db are used. [FlavioJS] 2007/01/11 * Fixed the script engine not parsing strings in multibyte charsets correctly (should have been done in r9532). diff --git a/src/map/clif.c b/src/map/clif.c index 2e40bf7da..ddf14927d 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8200,8 +8200,9 @@ void clif_parse_WantToConnection(int fd, TBL_PC* sd) } else {// packet version accepted TBL_PC* old_sd; + struct block_list* bl; - if( map_id2bl(account_id) != NULL ) + if( (bl=map_id2bl(account_id)) != NULL && bl->type != BL_PC ) {// non-player object already has that id ShowError("clif_parse_WantToConnection: a non-player object already has id %d, please increase the starting account number\n", account_id); WFIFOHEAD(fd,packet_len(0x6a)); |