1 files changed, 26 insertions, 8 deletions
diff --git a/src/char/char.c b/src/char/char.c
index c50dbe126..8afd7c5af 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -565,6 +565,31 @@ int mmo_char_fromstr(char *str, struct mmo_charstatus *p, struct global_reg *reg
 	p->account_id = tmp_int[1];
 	p->char_num = tmp_int[2];
 	p->class_ = tmp_int[3];
+	//Temporal fix until all chars are reverted from peco-flying-class to 
+	//normal classes. [Skotlex]
+	switch (p->class_) {
+		case 13: //Job_Knight2
+			p->class_ = 7;
+			break;
+		case 21: //Job_Crusader2
+			p->class_ = 14;
+			break;
+		case 4014: //Job_Lord_Knight2
+			p->class_	= 4008;
+			break;
+		case 4022: //Job_Paladin2
+			p->class_ = 4015;
+			break;
+		case 4036: //Job_Baby_Knight2
+			p->class_ = 4030;
+			break;
+		case 4044: //Job_Baby_Crusader2
+			p->class_ = 4037;
+			break;
+		case 4048: //Job_Star_Gladiator2
+			p->class_ = 4047;
+			break;
+	}
 	p->base_level = tmp_int[4];
 	p->job_level = tmp_int[5];
 	p->base_exp = tmp_uint[0];
@@ -1645,14 +1670,7 @@ 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;
-
-		// pecopeco knights/crusaders crash fix
-		if (p->class_ == 13 || p->class_ == 21 ||
-			p->class_ == 4014 || p->class_ == 4022 ||
-				p->class_ == 4036 || p->class_ == 4044)
-			WFIFOW(fd,j+56) = 0;
-		else WFIFOW(fd,j+56) = p->weapon;
-
+		WFIFOW(fd,j+56) = p->option&0x20?0:p->weapon; //When the weapon is sent and your option is riding, the client crashes on login!?
 		WFIFOW(fd,j+58) = p->base_level;
 		WFIFOW(fd,j+60) = (p->skill_point>SHRT_MAX)? SHRT_MAX : p->skill_point;
 		WFIFOW(fd,j+62) = p->head_bottom;