From fdbe7b1fb20a0e0f271b8e5c29e466acda995598 Mon Sep 17 00:00:00 2001 From: celest Date: Fri, 18 Feb 2005 08:38:09 +0000 Subject: [PATCH] Fixed client errors when pecopeco Lord Knights/Paladins log in with a weapon equipped git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1132 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-SVN.txt | 2 ++ src/char/char.c | 8 +++++++- src/char_sql/char.c | 8 +++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index 5a3de0f2c4..1e6b833dc8 100644 --- a/Changelog-SVN.txt +++ b/Changelog-SVN.txt @@ -1,6 +1,8 @@ Date Added 02/18 + * Fixed client errors when pecopeco Lord Knights/Paladins log in with a weapon + equipped [celest] * Added bAddRace2 -- check item_bonus.txt [celest] * Added mob_race2_db.txt -- contains 'main races' of certain monsters [celest] * Updated description for backup_txt in char_athena.conf a bit [celest] diff --git a/src/char/char.c b/src/char/char.c index 72de37e03d..9457ce89fa 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1432,7 +1432,13 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) { WFIFOW(fd,j+50) = DEFAULT_WALK_SPEED; // p->speed; WFIFOW(fd,j+52) = p->class_; WFIFOW(fd,j+54) = p->hair; - WFIFOW(fd,j+56) = p->weapon; + + // pecopeco knights/crusaders crash fix + if (p->class_ == 13 || p->class_ == 21 || + p->class_ == 4014 || p->class_ == 4022) + WFIFOW(fd,j+56) = 0; + else WFIFOW(fd,j+56) = p->weapon; + WFIFOW(fd,j+58) = p->base_level; WFIFOW(fd,j+60) = p->skill_point; WFIFOW(fd,j+62) = p->head_bottom; diff --git a/src/char_sql/char.c b/src/char_sql/char.c index db62d05cf7..8181ead2b2 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1568,7 +1568,13 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) { WFIFOW(fd,j+50) = DEFAULT_WALK_SPEED; // p->speed; WFIFOW(fd,j+52) = p->class_; WFIFOW(fd,j+54) = p->hair; - WFIFOW(fd,j+56) = p->weapon; + + // pecopeco knights/crusaders crash fix + if (p->class_ == 13 || p->class_ == 21 || + p->class_ == 4014 || p->class_ == 4022) + WFIFOW(fd,j+56) = 0; + else WFIFOW(fd,j+56) = p->weapon; + WFIFOW(fd,j+58) = p->base_level; WFIFOW(fd,j+60) = p->skill_point; WFIFOW(fd,j+62) = p->head_bottom;