summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-18 08:38:09 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-18 08:38:09 +0000
commit01a798606ae8f8a95884cebf0ecc23f446539282 (patch)
tree6517df83b88dd5a714984780301192d6cafb370e
parentaa52f1d90449e970bd5972db00ef29f77eaa39d7 (diff)
downloadhercules-01a798606ae8f8a95884cebf0ecc23f446539282.tar.gz
hercules-01a798606ae8f8a95884cebf0ecc23f446539282.tar.bz2
hercules-01a798606ae8f8a95884cebf0ecc23f446539282.tar.xz
hercules-01a798606ae8f8a95884cebf0ecc23f446539282.zip
Fixed client errors when pecopeco Lord Knights/Paladins log in with a weapon equipped
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1132 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-SVN.txt2
-rw-r--r--src/char/char.c8
-rw-r--r--src/char_sql/char.c8
3 files changed, 16 insertions, 2 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 5a3de0f2c..1e6b833dc 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 72de37e03..9457ce89f 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 db62d05cf..8181ead2b 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;