23 files changed, 1293 insertions, 264 deletions
diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index d63ed7b99..ec3479f4d 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -681,6 +681,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "PACKET_ZC_ADD_ITEM_TO_MAIL", sizeof(struct PACKET_ZC_ADD_ITEM_TO_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ADD_ITEM_TO_STORE", sizeof(struct PACKET_ZC_ADD_ITEM_TO_STORE), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ADD_MEMBER_TO_GROUP", sizeof(struct PACKET_ZC_ADD_MEMBER_TO_GROUP), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_ADD_SKILL", sizeof(struct PACKET_ZC_ADD_SKILL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_BAN_LIST", sizeof(struct PACKET_ZC_BAN_LIST), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_BAN_LIST_sub", sizeof(struct PACKET_ZC_BAN_LIST_sub), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_CASH_ITEM_DELETE", sizeof(struct PACKET_ZC_CASH_ITEM_DELETE), SERVER_TYPE_MAP },
@@ -716,6 +717,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "PACKET_ZC_NOTIFY_UNREADMAIL", sizeof(struct PACKET_ZC_NOTIFY_UNREADMAIL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_NOTIFY_WEAPONITEMLIST", sizeof(struct PACKET_ZC_NOTIFY_WEAPONITEMLIST), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_NOTIFY_WEAPONITEMLIST_sub", sizeof(struct PACKET_ZC_NOTIFY_WEAPONITEMLIST_sub), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_NPC_MARKET_PURCHASE_RESULT_sub", sizeof(struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT_sub), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_OPEN_UI", sizeof(struct PACKET_ZC_OPEN_UI), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_OVERWEIGHT_PERCENT", sizeof(struct PACKET_ZC_OVERWEIGHT_PERCENT), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_PC_CASH_POINT_ITEMLIST", sizeof(struct PACKET_ZC_PC_CASH_POINT_ITEMLIST), SERVER_TYPE_MAP },
@@ -735,6 +737,8 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "PACKET_ZC_SEARCH_STORE_INFO_ACK", sizeof(struct PACKET_ZC_SEARCH_STORE_INFO_ACK), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_SEARCH_STORE_INFO_ACK_sub", sizeof(struct PACKET_ZC_SEARCH_STORE_INFO_ACK_sub), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_SKILL_SCALE", sizeof(struct PACKET_ZC_SKILL_SCALE), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_SKILLINFO_LIST", sizeof(struct PACKET_ZC_SKILLINFO_LIST), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_SKILLINFO_UPDATE2", sizeof(struct PACKET_ZC_SKILLINFO_UPDATE2), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_SPRITE_CHANGE", sizeof(struct PACKET_ZC_SPRITE_CHANGE), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_STATUS_CHANGE_ACK", sizeof(struct PACKET_ZC_STATUS_CHANGE_ACK), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_STYLE_CHANGE_RES", sizeof(struct PACKET_ZC_STYLE_CHANGE_RES), SERVER_TYPE_MAP },
@@ -744,6 +748,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "PACKET_ZC_WARPLIST", sizeof(struct PACKET_ZC_WARPLIST), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_WARPLIST_sub", sizeof(struct PACKET_ZC_WARPLIST_sub), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_WRITE_MAIL_RESULT", sizeof(struct PACKET_ZC_WRITE_MAIL_RESULT), SERVER_TYPE_MAP },
+		{ "SKILLDATA", sizeof(struct SKILLDATA), SERVER_TYPE_MAP },
 		{ "ZC_INVENTORY_END", sizeof(struct ZC_INVENTORY_END), SERVER_TYPE_MAP },
 		{ "ZC_INVENTORY_START", sizeof(struct ZC_INVENTORY_START), SERVER_TYPE_MAP },
 		{ "ZC_PROGRESS_ACTOR", sizeof(struct ZC_PROGRESS_ACTOR), SERVER_TYPE_MAP },
@@ -790,7 +795,6 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "packet_monster_hp", sizeof(struct packet_monster_hp), SERVER_TYPE_MAP },
 		{ "packet_notify_bounditem", sizeof(struct packet_notify_bounditem), SERVER_TYPE_MAP },
 		{ "packet_npc_market_purchase", sizeof(struct packet_npc_market_purchase), SERVER_TYPE_MAP },
-		{ "packet_npc_market_result_ack", sizeof(struct packet_npc_market_result_ack), SERVER_TYPE_MAP },
 		{ "packet_package_item_announce", sizeof(struct packet_package_item_announce), SERVER_TYPE_MAP },
 		{ "packet_party_leader_changed", sizeof(struct packet_party_leader_changed), SERVER_TYPE_MAP },
 		{ "packet_quest_add_header", sizeof(struct packet_quest_add_header), SERVER_TYPE_MAP },
diff --git a/src/common/packets/packets2019_len_main.h b/src/common/packets/packets2019_len_main.h
index bfcb7c159..949aae804 100644
--- a/src/common/packets/packets2019_len_main.h
+++ b/src/common/packets/packets2019_len_main.h
@@ -4312,7 +4312,9 @@ packetLen(0x0b02, 26)  // AC_REFUSE_LOGIN4
 packetLen(0x0b03, -1)  // ZC_EQUIPWIN_MICROSCOPE_V7
 
 // Packet: 0x0b04
-#if PACKETVER >= 20190605
+#if PACKETVER >= 20190807
+packetLen(0x0b04, 90)
+#elif PACKETVER >= 20190605
 packetLen(0x0b04, 72)
 #elif PACKETVER >= 20190109
 packetLen(0x0b04, 80)
@@ -4521,17 +4523,17 @@ packetLen(0x0b30, -1)
 
 // Packet: 0x0b31
 #if PACKETVER >= 20190619
-packetLen(0x0b31, 17)
+packetLen(0x0b31, 17)  // ZC_ADD_SKILL
 #endif
 
 // Packet: 0x0b32
 #if PACKETVER >= 20190619
-packetLen(0x0b32, -1)
+packetLen(0x0b32, -1)  // ZC_SKILLINFO_LIST
 #endif
 
 // Packet: 0x0b33
 #if PACKETVER >= 20190619
-packetLen(0x0b33, 17)
+packetLen(0x0b33, 17)  // ZC_SKILLINFO_UPDATE2
 #endif
 
 // Packet: 0x0b34
@@ -4662,9 +4664,51 @@ packetLen(0x0b4c, 2)
 #endif
 
 // Packet: 0x0b4d
-#if PACKETVER >= 20190724
+#if PACKETVER >= 20190807
+packetLen(0x0b4d, -1)
+#elif PACKETVER >= 20190724
 packetLen(0x0b4d, 6)
 #endif
 
+// Packet: 0x0b4e
+#if PACKETVER >= 20190807
+packetLen(0x0b4e, -1)
+#endif
+
+// Packet: 0x0b4f
+#if PACKETVER >= 20190807
+packetLen(0x0b4f, 2)
+#endif
+
+// Packet: 0x0b50
+#if PACKETVER >= 20190807
+packetLen(0x0b50, 2)
+#endif
+
+// Packet: 0x0b51
+#if PACKETVER >= 20190807
+packetLen(0x0b51, 2)
+#endif
+
+// Packet: 0x0b52
+#if PACKETVER >= 20190807
+packetLen(0x0b52, 2)
+#endif
+
+// Packet: 0x0b53
+#if PACKETVER >= 20190821
+packetLen(0x0b53, 52)
+#endif
+
+// Packet: 0x0b54
+#if PACKETVER >= 20190821
+packetLen(0x0b54, 8)
+#endif
+
+// Packet: 0x0b55
+#if PACKETVER >= 20190821
+packetLen(0x0b55, -1)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_MAIN_H */
diff --git a/src/common/packets/packets2019_len_re.h b/src/common/packets/packets2019_len_re.h
index 33aa7a524..c31a10191 100644
--- a/src/common/packets/packets2019_len_re.h
+++ b/src/common/packets/packets2019_len_re.h
@@ -4318,7 +4318,9 @@ packetLen(0x0b02, 26)  // AC_REFUSE_LOGIN4
 packetLen(0x0b03, -1)  // ZC_EQUIPWIN_MICROSCOPE_V7
 
 // Packet: 0x0b04
-#if PACKETVER >= 20190605
+#if PACKETVER >= 20190807
+packetLen(0x0b04, 90)
+#elif PACKETVER >= 20190605
 packetLen(0x0b04, 72)
 #elif PACKETVER >= 20190109
 packetLen(0x0b04, 80)
@@ -4533,17 +4535,17 @@ packetLen(0x0b30, -1)
 
 // Packet: 0x0b31
 #if PACKETVER >= 20190619
-packetLen(0x0b31, 17)
+packetLen(0x0b31, 17)  // ZC_ADD_SKILL
 #endif
 
 // Packet: 0x0b32
 #if PACKETVER >= 20190619
-packetLen(0x0b32, -1)
+packetLen(0x0b32, -1)  // ZC_SKILLINFO_LIST
 #endif
 
 // Packet: 0x0b33
 #if PACKETVER >= 20190619
-packetLen(0x0b33, 17)
+packetLen(0x0b33, 17)  // ZC_SKILLINFO_UPDATE2
 #endif
 
 // Packet: 0x0b34
@@ -4674,9 +4676,51 @@ packetLen(0x0b4c, 2)
 #endif
 
 // Packet: 0x0b4d
-#if PACKETVER >= 20190724
+#if PACKETVER >= 20190807
+packetLen(0x0b4d, -1)
+#elif PACKETVER >= 20190724
 packetLen(0x0b4d, 6)
 #endif
 
+// Packet: 0x0b4e
+#if PACKETVER >= 20190807
+packetLen(0x0b4e, -1)
+#endif
+
+// Packet: 0x0b4f
+#if PACKETVER >= 20190807
+packetLen(0x0b4f, 2)
+#endif
+
+// Packet: 0x0b50
+#if PACKETVER >= 20190807
+packetLen(0x0b50, 2)
+#endif
+
+// Packet: 0x0b51
+#if PACKETVER >= 20190807
+packetLen(0x0b51, 2)
+#endif
+
+// Packet: 0x0b52
+#if PACKETVER >= 20190807
+packetLen(0x0b52, 2)
+#endif
+
+// Packet: 0x0b53
+#if PACKETVER >= 20190821
+packetLen(0x0b53, 52)
+#endif
+
+// Packet: 0x0b54
+#if PACKETVER >= 20190821
+packetLen(0x0b54, 8)
+#endif
+
+// Packet: 0x0b55
+#if PACKETVER >= 20190821
+packetLen(0x0b55, -1)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_RE_H */
diff --git a/src/common/packets/packets2019_len_zero.h b/src/common/packets/packets2019_len_zero.h
index 7b9310cf2..abe81796c 100644
--- a/src/common/packets/packets2019_len_zero.h
+++ b/src/common/packets/packets2019_len_zero.h
@@ -4312,7 +4312,9 @@ packetLen(0x0b02, 26)  // AC_REFUSE_LOGIN4
 packetLen(0x0b03, -1)  // ZC_EQUIPWIN_MICROSCOPE_V7
 
 // Packet: 0x0b04
-#if PACKETVER >= 20190605
+#if PACKETVER >= 20190814
+packetLen(0x0b04, 90)
+#elif PACKETVER >= 20190605
 packetLen(0x0b04, 72)
 #elif PACKETVER >= 20190116
 packetLen(0x0b04, 80)
@@ -4513,17 +4515,17 @@ packetLen(0x0b30, -1)
 
 // Packet: 0x0b31
 #if PACKETVER >= 20190626
-packetLen(0x0b31, 17)
+packetLen(0x0b31, 17)  // ZC_ADD_SKILL
 #endif
 
 // Packet: 0x0b32
 #if PACKETVER >= 20190626
-packetLen(0x0b32, -1)
+packetLen(0x0b32, -1)  // ZC_SKILLINFO_LIST
 #endif
 
 // Packet: 0x0b33
 #if PACKETVER >= 20190626
-packetLen(0x0b33, 17)
+packetLen(0x0b33, 17)  // ZC_SKILLINFO_UPDATE2
 #endif
 
 // Packet: 0x0b34
@@ -4654,9 +4656,46 @@ packetLen(0x0b4c, 2)
 #endif
 
 // Packet: 0x0b4d
-#if PACKETVER >= 20190724
+#if PACKETVER >= 20190814
+packetLen(0x0b4d, -1)
+#elif PACKETVER >= 20190724
 packetLen(0x0b4d, 6)
 #endif
 
+// Packet: 0x0b4e
+#if PACKETVER >= 20190814
+packetLen(0x0b4e, -1)
+#endif
+
+// Packet: 0x0b4f
+#if PACKETVER >= 20190814
+packetLen(0x0b4f, 2)
+#endif
+
+// Packet: 0x0b50
+#if PACKETVER >= 20190814
+packetLen(0x0b50, 2)
+#endif
+
+// Packet: 0x0b51
+#if PACKETVER >= 20190814
+packetLen(0x0b51, 2)
+#endif
+
+// Packet: 0x0b52
+#if PACKETVER >= 20190814
+packetLen(0x0b52, 2)
+#endif
+
+// Packet: 0x0b53
+#if PACKETVER >= 20190814
+packetLen(0x0b53, 52)
+#endif
+
+// Packet: 0x0b54
+#if PACKETVER >= 20190814
+packetLen(0x0b54, 8)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_ZERO_H */
diff --git a/src/map/clif.c b/src/map/clif.c
index 3b7691ae4..421274b0f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -92,9 +92,6 @@ static struct packet_itemlist_equip itemlist_equip;
 static struct ZC_STORE_ITEMLIST_NORMAL storelist_normal;
 static struct ZC_STORE_ITEMLIST_EQUIP storelist_equip;
 static struct packet_viewequip_ack viewequip_list;
-#if PACKETVER >= 20131223
-static struct packet_npc_market_result_ack npcmarket_result;
-#endif
 // temporart buffer for send big packets
 char packet_buf[0xffff];
 //#define DUMP_UNKNOWN_PACKET
@@ -5254,58 +5251,79 @@ static int clif_insight(struct block_list *bl, va_list ap)
 	return 0;
 }
 
+static void clif_playerSkillToPacket(struct map_session_data *sd, struct SKILLDATA *skillData, int skillId, int idx, bool newSkill)
+{
+	nullpo_retv(sd);
+	nullpo_retv(skillData);
+	Assert_retv(idx >= 0 && idx < MAX_SKILL_DB);
+
+	int skill_lv = sd->status.skill[idx].lv;
+	skillData->id = skillId;
+	skillData->inf = skill->get_inf(skillId);
+	skillData->level = skill_lv;
+	if (skill_lv > 0) {
+		skillData->sp = skill->get_sp(skillId, skill_lv);
+		skillData->range2 = skill->get_range2(&sd->bl, skillId, skill_lv);
+	} else {
+		skillData->sp = 0;
+		skillData->range2 = 0;
+	}
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814
+	if (newSkill)
+		skillData->level2 = 0;
+	else
+		skillData->level2 = skill_lv;
+#else
+	safestrncpy(skillData->name, skill->get_name(skillId), NAME_LENGTH);
+#endif
+	if (sd->status.skill[idx].flag == SKILL_FLAG_PERMANENT)
+		skillData->upFlag = (skill_lv < skill->tree_get_max(skillId, sd->status.class)) ? 1 : 0;
+	else
+		skillData->upFlag = 0;
+}
+
 /// Updates whole skill tree (ZC_SKILLINFO_LIST).
 /// 010f <packet len>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <skill name>.24B <upgradable>.B }*
 static void clif_skillinfoblock(struct map_session_data *sd)
 {
-	int fd;
-	int i,len,id;
-
 	nullpo_retv(sd);
 
-	fd=sd->fd;
-	if (!fd) return;
+	int fd = sd->fd;
+	if (!fd)
+		return;
+
+	WFIFOHEAD(fd, sizeof(struct PACKET_ZC_SKILLINFO_LIST) + MAX_SKILL_DB * sizeof(struct SKILLDATA));
+	struct PACKET_ZC_SKILLINFO_LIST *p = WFIFOP(fd, 0);
 
-	WFIFOHEAD(fd, MAX_SKILL_DB * 37 + 4);
-	WFIFOW(fd,0) = 0x10f;
-	for ( i = 0, len = 4; i < MAX_SKILL_DB; i++) {
-		if( (id = sd->status.skill[i].id) != 0 ) {
-			int level;
+	p->packetType = HEADER_ZC_SKILLINFO_LIST;
+	int skillIndex = 0;
+	int len = sizeof(struct PACKET_ZC_SKILLINFO_LIST);
+	int i;
+	for (i = 0; i < MAX_SKILL_DB; i++) {
+		int id = sd->status.skill[i].id;
+		if (id != 0) {
 			// workaround for bugreport:5348
-			if (len + 37 > 8192)
+			if (len + sizeof(struct SKILLDATA) > 8192)
 				break;
 
-			WFIFOW(fd, len)   = id;
-			WFIFOL(fd, len + 2) = skill->get_inf(id);
-			level = sd->status.skill[i].lv;
-			WFIFOW(fd, len + 6) = level;
-			if (level) {
-				WFIFOW(fd, len + 8) = skill->get_sp(id, level);
-				WFIFOW(fd, len + 10)= skill->get_range2(&sd->bl, id, level);
-			}
-			else {
-				WFIFOW(fd, len + 8) = 0;
-				WFIFOW(fd, len + 10)= 0;
-			}
-			safestrncpy(WFIFOP(fd,len+12), skill->get_name(id), NAME_LENGTH);
-			if(sd->status.skill[i].flag == SKILL_FLAG_PERMANENT)
-				WFIFOB(fd,len+36) = (sd->status.skill[i].lv < skill->tree_get_max(id, sd->status.class))? 1:0;
-			else
-				WFIFOB(fd,len+36) = 0;
-			len += 37;
+			clif->playerSkillToPacket(sd, &p->skills[skillIndex], id, i, false);
+			len += sizeof(struct SKILLDATA);
+			skillIndex++;
 		}
 	}
-	WFIFOW(fd,2)=len;
-	WFIFOSET(fd,len);
+	p->packetLength = len;
+	WFIFOSET(fd, len);
 
 	// workaround for bugreport:5348; send the remaining skills one by one to bypass packet size limit
-	for ( ; i < MAX_SKILL_DB; i++) {
-		if( (id = sd->status.skill[i].id) != 0 ) {
+	for (; i < MAX_SKILL_DB; i++) {
+		int id = sd->status.skill[i].id;
+		if (id != 0) {
 			clif->addskill(sd, id);
 			clif->skillinfo(sd, id, 0);
 		}
 	}
 }
+
 /**
  * Server tells client 'sd' to add skill of id 'id' to it's skill tree (e.g. with Ice Falcion item)
  **/
@@ -5314,36 +5332,21 @@ static void clif_skillinfoblock(struct map_session_data *sd)
 /// 0111 <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <skill name>.24B <upgradable>.B
 static void clif_addskill(struct map_session_data *sd, int id)
 {
-	int fd, skill_lv, idx = skill->get_index(id);
-
 	nullpo_retv(sd);
 
-	fd = sd->fd;
-	if (!fd) return;
+	int fd = sd->fd;
+	if (!fd)
+		return;
 
+	int idx = skill->get_index(id);
 	if (sd->status.skill[idx].id <= 0)
 		return;
 
-	skill_lv = sd->status.skill[idx].lv;
-
-	WFIFOHEAD(fd, packet_len(0x111));
-	WFIFOW(fd,0) = 0x111;
-	WFIFOW(fd,2) = id;
-	WFIFOL(fd,4) = skill->get_inf(id);
-	WFIFOW(fd,8) = skill_lv;
-	if (skill_lv > 0) {
-		WFIFOW(fd,10) = skill->get_sp(id, skill_lv);
-		WFIFOW(fd,12) = skill->get_range2(&sd->bl, id, skill_lv);
-	} else {
-		WFIFOW(fd,10) = 0;
-		WFIFOW(fd,12) = 0;
-	}
-	safestrncpy(WFIFOP(fd,14), skill->get_name(id), NAME_LENGTH);
-	if (sd->status.skill[idx].flag == SKILL_FLAG_PERMANENT)
-		WFIFOB(fd,38) = (skill_lv < skill->tree_get_max(id, sd->status.class))? 1:0;
-	else
-		WFIFOB(fd,38) = 0;
-	WFIFOSET(fd,packet_len(0x111));
+	WFIFOHEAD(fd, sizeof(struct PACKET_ZC_ADD_SKILL));
+	struct PACKET_ZC_ADD_SKILL *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_ADD_SKILL;
+	clif->playerSkillToPacket(sd, &p->skill, id, idx, true);
+	WFIFOSET(fd, sizeof(struct PACKET_ZC_ADD_SKILL));
 }
 
 /// Deletes a skill from the skill tree (ZC_SKILLINFO_DELETE).
@@ -5396,32 +5399,34 @@ static void clif_skillup(struct map_session_data *sd, uint16 skill_id, int skill
 /// 07e1 <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <upgradable>.B
 static void clif_skillinfo(struct map_session_data *sd, int skill_id, int inf)
 {
+	nullpo_retv(sd);
+
 	const int fd = sd->fd;
 	int idx = skill->get_index(skill_id);
-	int skill_lv;
-
-	nullpo_retv(sd);
 	Assert_retv(idx >= 0 && idx < MAX_SKILL_DB);
 
-	skill_lv = sd->status.skill[idx].lv;
-
-	WFIFOHEAD(fd,packet_len(0x7e1));
-	WFIFOW(fd,0) = 0x7e1;
-	WFIFOW(fd,2) = skill_id;
-	WFIFOL(fd,4) = inf?inf:skill->get_inf(skill_id);
-	WFIFOW(fd,8) = skill_lv;
+	WFIFOHEAD(fd, sizeof(struct PACKET_ZC_SKILLINFO_UPDATE2));
+	struct PACKET_ZC_SKILLINFO_UPDATE2 *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_SKILLINFO_UPDATE2;
+	int skill_lv = sd->status.skill[idx].lv;
+	p->id = skill_id;
+	p->inf = skill->get_inf(skill_id);
+	p->level = skill_lv;
 	if (skill_lv > 0) {
-		WFIFOW(fd,10) = skill->get_sp(skill_id, skill_lv);
-		WFIFOW(fd,12) = skill->get_range2(&sd->bl, skill_id, skill_lv);
+		p->sp = skill->get_sp(skill_id, skill_lv);
+		p->range2 = skill->get_range2(&sd->bl, skill_id, skill_lv);
 	} else {
-		WFIFOW(fd,10) = 0;
-		WFIFOW(fd,12) = 0;
+		p->sp = 0;
+		p->range2 = 0;
 	}
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814
+	p->level2 = skill_lv;
+#endif
 	if (sd->status.skill[idx].flag == SKILL_FLAG_PERMANENT)
-		WFIFOB(fd,14) = (skill_lv < skill->tree_get_max(skill_id, sd->status.class))? 1:0;
+		p->upFlag = (skill_lv < skill->tree_get_max(skill_id, sd->status.class)) ? 1 : 0;
 	else
-		WFIFOB(fd,14) = 0;
-	WFIFOSET(fd,packet_len(0x7e1));
+		p->upFlag = 0;
+	WFIFOSET(fd, sizeof(struct PACKET_ZC_SKILLINFO_UPDATE2));
 }
 
 /// Notifies clients in area, that an object is about to use a skill.
@@ -5993,7 +5998,7 @@ static void clif_cooking_list(struct map_session_data *sd, int trigger, uint16 s
 	len = sizeof(struct PACKET_ZC_MAKINGITEM_LIST) + MAX_SKILL_PRODUCE_DB * sizeof(struct PACKET_ZC_MAKINGITEM_LIST_sub);
 	WFIFOHEAD(fd, len);
 	p = WFIFOP(fd, 0);
-	p->packetType = 0x25a;
+	p->packetType = HEADER_ZC_MAKINGITEM_LIST;
 	p->makeItem = list_type; // list type
 
 	c = 0;
@@ -10980,9 +10985,13 @@ static void clif_parse_progressbar(int fd, struct map_session_data *sd) __attrib
 /// 02f1
 static void clif_parse_progressbar(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int npc_id = sd->progressbar.npc_id;
+	Assert_retv(npc_id != 0);
 
-	if( timer->gettick() < sd->progressbar.timeout && sd->st )
+	if (timer->gettick() < sd->progressbar.timeout && sd->st)
 		sd->st->state = END;
 
 	sd->progressbar.timeout = sd->state.workinprogress = sd->progressbar.npc_id = 0;
@@ -11007,7 +11016,7 @@ static void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
 		; //You CAN walk on this OPT1 value.
 	/*else if( sd->progressbar.npc_id )
 		clif->progressbar_abort(sd);*/
-	else if (pc_cant_act(sd))
+	else if (pc_cant_act(sd) || pc_isvending(sd))
 		return;
 
 	if(sd->sc.data[SC_RUN] || sd->sc.data[SC_WUGDASH])
@@ -11167,7 +11176,10 @@ static void clif_parse_GlobalMessage(int fd, struct map_session_data *sd)
 				timer->settick(sd->fontcolor_tid, td->tick+5000);
 		}
 
-		color = channel->config->colors[sd->fontcolor - 1];
+		int fontColor = sd->fontcolor - 1;
+		if (fontColor < 0 || fontColor >= channel->config->colors_count)
+			fontColor = 0;
+		color = channel->config->colors[fontColor];
 		WFIFOHEAD(fd, outlen + 12);
 		WFIFOW(fd,0) = 0x2C1;
 		WFIFOW(fd,2) = outlen + 12;
@@ -11372,10 +11384,10 @@ static void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action
 				return;
 			}
 
-			if( pc_cant_act(sd) || pc_issit(sd) || sd->sc.option&OPTION_HIDE )
+			if (pc_cant_act(sd) || pc_issit(sd) || sd->sc.option&OPTION_HIDE || pc_isvending(sd))
 				return;
 
-			if( sd->sc.option&OPTION_COSTUME )
+			if (sd->sc.option & OPTION_COSTUME)
 				return;
 
 			if (!battle_config.sdelay_attack_enable && pc->checkskill(sd, SA_FREECAST) <= 0 && (skill->get_inf2(sd->ud.skill_id) & (INF2_FREE_CAST_REDUCED | INF2_FREE_CAST_NORMAL)) == 0) {
@@ -11553,8 +11565,8 @@ static void clif_parse_WisMessage(int fd, struct map_session_data *sd)
 				script->set_var(sd,output,(char *) split_data[i]);
 			}
 
-			sprintf(output, "%s::OnWhisperGlobal", nd->exname);
-			npc->event(sd,output,0); // Calls the NPC label
+			safesnprintf(output, 255, "%s::OnWhisperGlobal", nd->exname);
+			npc->event(sd,output, 0); // Calls the NPC label
 
 			return;
 		}
@@ -11633,7 +11645,7 @@ static void clif_parse_Broadcast(int fd, struct map_session_data *sd)
 	char command[sizeof commandname + 2 + CHAT_SIZE_MAX] = ""; // '@' command + ' ' + message + NUL
 	int len = (int)RFIFOW(fd,2) - 4;
 
-	if (len < 0)
+	if (len <= 0)
 		return;
 
 	sprintf(command, "%c%s ", atcommand->at_symbol, commandname);
@@ -11733,6 +11745,9 @@ static void clif_parse_UseItem(int fd, struct map_session_data *sd)
 {
 	int n;
 
+	if (pc_isvending(sd))
+		return;
+
 	if (pc_isdead(sd)) {
 		clif->clearunit_area(&sd->bl, CLR_DEAD);
 		return;
@@ -11758,15 +11773,17 @@ static void clif_parse_EquipItem(int fd, struct map_session_data *sd) __attribut
 static void clif_parse_EquipItem(int fd, struct map_session_data *sd)
 {
 	const struct packet_equip_item *p = RP2PTR(fd);
-	int index = 0;
 
-	if(pc_isdead(sd)) {
+	if (pc_isvending(sd))
+		return;
+
+	if (pc_isdead(sd)) {
 		clif->clearunit_area(&sd->bl,CLR_DEAD);
 		return;
 	}
 
-	index = p->index - 2;
-	if (index >= sd->status.inventorySize)
+	int index = p->index - 2;
+	if (index < 0 || index >= sd->status.inventorySize)
 		return; //Out of bounds check.
 
 	if( sd->npc_id ) {
@@ -11777,15 +11794,15 @@ static void clif_parse_EquipItem(int fd, struct map_session_data *sd)
 	else if ( pc_cant_act2(sd) || sd->state.prerefining )
 		return;
 
-	if(!sd->status.inventory[index].identify) {
-		clif->equipitemack(sd, index, 0, EIA_FAIL);// fail
+	if (!sd->status.inventory[index].identify) {
+		clif->equipitemack(sd, index, 0, EIA_FAIL);  // fail
 		return;
 	}
 
-	if(!sd->inventory_data[index])
+	if (!sd->inventory_data[index])
 		return;
 
-	if(sd->inventory_data[index]->type == IT_PETARMOR){
+	if (sd->inventory_data[index]->type == IT_PETARMOR) {
 		pet->equipitem(sd, index);
 		return;
 	}
@@ -11793,7 +11810,7 @@ static void clif_parse_EquipItem(int fd, struct map_session_data *sd)
 	pc->update_idle_time(sd, BCIDLE_USEITEM);
 
 	//Client doesn't send the position for ammo.
-	if(sd->inventory_data[index]->type == IT_AMMO)
+	if (sd->inventory_data[index]->type == IT_AMMO)
 		pc->equipitem(sd, index, EQP_AMMO);
 	else
 		pc->equipitem(sd, index, p->wearLocation);
@@ -11806,6 +11823,9 @@ static void clif_parse_UnequipItem(int fd, struct map_session_data *sd)
 {
 	int index;
 
+	if (pc_isvending(sd))
+		return;
+
 	if(pc_isdead(sd)) {
 		clif->clearunit_area(&sd->bl,CLR_DEAD);
 		return;
@@ -11878,7 +11898,7 @@ static void clif_parse_NpcBuySellSelected(int fd, struct map_session_data *sd) _
 ///     1 = sell
 static void clif_parse_NpcBuySellSelected(int fd, struct map_session_data *sd)
 {
-	if (sd->state.trading)
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
 		return;
 	npc->buysellsel(sd, RFIFOL(fd,2), RFIFOB(fd,6));
 }
@@ -11914,9 +11934,12 @@ static void clif_parse_NpcBuyListSend(int fd, struct map_session_data *sd) __att
 /// 00c8 <packet len>.W { <amount>.W <name id>.W }*
 static void clif_parse_NpcBuyListSend(int fd, struct map_session_data *sd)
 {
-	int n = ((int)RFIFOW(fd, 2) - sizeof(struct PACKET_CZ_PC_PURCHASE_ITEMLIST)) / sizeof(struct PACKET_CZ_PC_PURCHASE_ITEMLIST_sub);
-	int result;
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_PC_PURCHASE_ITEMLIST *p = RFIFOP(fd, 0);
+	int n = ((int)p->packetLength - sizeof(struct PACKET_CZ_PC_PURCHASE_ITEMLIST)) / sizeof(struct PACKET_CZ_PC_PURCHASE_ITEMLIST_sub);
+	int result;
 
 	Assert_retv(n >= 0);
 
@@ -11974,7 +11997,7 @@ static void clif_parse_NpcSellListSend(int fd, struct map_session_data *sd)
 
 	Assert_retv(n >= 0);
 
-	if (sd->state.trading || !sd->npc_shopid) {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd) || !sd->npc_shopid) {
 		fail = 1;
 	} else {
 		struct itemlist item_list = { 0 };
@@ -12009,6 +12032,9 @@ static void clif_parse_CreateChatRoom(int fd, struct map_session_data *sd) __att
 ///     1 = public
 static void clif_parse_CreateChatRoom(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int len = (int)RFIFOW(fd, 2) - 15;
 	int limit;
 	bool pub;
@@ -12025,6 +12051,9 @@ static void clif_parse_CreateChatRoom(int fd, struct map_session_data *sd)
 	password = RFIFOP(fd, 7); //not zero-terminated
 	title = RFIFOP(fd, 15); // not zero-terminated
 
+	if (limit < 0)
+		return;
+
 	if (pc_ismuted(&sd->sc, MANNER_NOROOM))
 		return;
 	if(battle_config.basic_skill_check && !pc->check_basicskill(sd, 4)) {
@@ -12051,6 +12080,9 @@ static void clif_parse_ChatAddMember(int fd, struct map_session_data *sd) __attr
 /// 00d9 <chat ID>.L <passwd>.8B
 static void clif_parse_ChatAddMember(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int chatid = RFIFOL(fd,2);
 	const char *password = RFIFOP(fd,6); // not zero-terminated
 
@@ -12065,6 +12097,9 @@ static void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data *sd)
 ///     1 = public
 static void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int len = (int)RFIFOW(fd, 2) - 15;
 	int limit;
 	bool pub;
@@ -12077,6 +12112,8 @@ static void clif_parse_ChatRoomStatusChange(int fd, struct map_session_data *sd)
 		return;
 
 	limit = RFIFOW(fd, 4);
+	if (limit < 0)
+		return;
 	pub = (RFIFOB(fd, 6) != 0);
 	password = RFIFOP(fd, 7); // not zero-terminated
 	title = RFIFOP(fd, 15); // not zero-terminated
@@ -12095,6 +12132,9 @@ static void clif_parse_ChangeChatOwner(int fd, struct map_session_data *sd) __at
 ///     1 = normal
 static void clif_parse_ChangeChatOwner(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	chat->change_owner(sd, RFIFOP(fd,6)); // non null terminated
 }
 
@@ -12103,6 +12143,9 @@ static void clif_parse_KickFromChat(int fd, struct map_session_data *sd) __attri
 /// 00e2 <name>.24B
 static void clif_parse_KickFromChat(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	chat->kick(sd, RFIFOP(fd,2)); // non null terminated
 }
 
@@ -12111,6 +12154,9 @@ static void clif_parse_ChatLeave(int fd, struct map_session_data *sd) __attribut
 /// 00e3
 static void clif_parse_ChatLeave(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	chat->leave(sd, false);
 }
 
@@ -12135,9 +12181,10 @@ static void clif_parse_TradeRequest(int fd, struct map_session_data *sd) __attri
 /// 00e4 <account id>.L
 static void clif_parse_TradeRequest(int fd, struct map_session_data *sd)
 {
-	struct map_session_data *t_sd;
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
 
-	t_sd = map->id2sd(RFIFOL(fd,2));
+	struct map_session_data *t_sd = map->id2sd(RFIFOL(fd, 2));
 
 	if (sd->chat_id == 0 && pc_cant_act(sd))
 		return; //You can trade while in a chatroom.
@@ -12164,6 +12211,9 @@ static void clif_parse_TradeAck(int fd, struct map_session_data *sd) __attribute
 ///     4 = rejected
 static void clif_parse_TradeAck(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	trade->ack(sd,RFIFOB(fd,2));
 }
 
@@ -12172,6 +12222,9 @@ static void clif_parse_TradeAddItem(int fd, struct map_session_data *sd) __attri
 /// 00e8 <index>.W <amount>.L
 static void clif_parse_TradeAddItem(int fd, struct map_session_data *sd)
 {
+	if (!sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	short index = RFIFOW(fd,2);
 	int amount = RFIFOL(fd,4);
 
@@ -12186,6 +12239,8 @@ static void clif_parse_TradeOk(int fd, struct map_session_data *sd) __attribute_
 /// 00eb
 static void clif_parse_TradeOk(int fd, struct map_session_data *sd)
 {
+	if (pc_isdead(sd) || pc_isvending(sd))
+		return;
 	trade->ok(sd);
 }
 
@@ -12194,6 +12249,9 @@ static void clif_parse_TradeCancel(int fd, struct map_session_data *sd) __attrib
 /// 00ed
 static void clif_parse_TradeCancel(int fd, struct map_session_data *sd)
 {
+	if (pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	trade->cancel(sd);
 }
 
@@ -12202,6 +12260,9 @@ static void clif_parse_TradeCommit(int fd, struct map_session_data *sd) __attrib
 /// 00ef
 static void clif_parse_TradeCommit(int fd, struct map_session_data *sd)
 {
+	if (pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	trade->commit(sd);
 }
 
@@ -12764,7 +12825,7 @@ static void clif_parse_ProduceMix(int fd, struct map_session_data *sd)
 		default:
 			return;
 	}
-	if (pc_istrading(sd)) {
+	if (pc_istrading(sd) || pc_isdead(sd) || pc_isvending(sd)) {
 		//Make it fail to avoid shop exploits where you sell something different than you see.
 		clif->skill_fail(sd, sd->ud.skill_id, USESKILL_FAIL_LEVEL, 0, 0);
 		clif_menuskill_clear(sd);
@@ -12795,7 +12856,7 @@ static void clif_parse_Cooking(int fd, struct map_session_data *sd)
 	if (type == 6 && sd->menuskill_id != GN_MIX_COOKING && sd->menuskill_id != GN_S_PHARMACY)
 		return;
 
-	if (pc_istrading(sd)) {
+	if (pc_istrading(sd) || pc_isdead(sd) || pc_isvending(sd)) {
 		//Make it fail to avoid shop exploits where you sell something different than you see.
 		clif->skill_fail(sd, sd->ud.skill_id, USESKILL_FAIL_LEVEL, 0, 0);
 		clif_menuskill_clear(sd);
@@ -12815,7 +12876,7 @@ static void clif_parse_RepairItem(int fd, struct map_session_data *sd)
 
 	if (sd->menuskill_id != BS_REPAIRWEAPON)
 		return;
-	if (pc_istrading(sd)) {
+	if (pc_istrading(sd) || pc_isdead(sd) || pc_isvending(sd)) {
 		//Make it fail to avoid shop exploits where you sell something different than you see.
 		clif->skill_fail(sd, sd->ud.skill_id, USESKILL_FAIL_LEVEL, 0, 0);
 		clif_menuskill_clear(sd);
@@ -12830,19 +12891,17 @@ static void clif_parse_WeaponRefine(int fd, struct map_session_data *sd) __attri
 /// 0222 <index>.L
 static void clif_parse_WeaponRefine(int fd, struct map_session_data *sd)
 {
-	int idx;
-
 	sd->state.prerefining = 0;
 
 	if (sd->menuskill_id != WS_WEAPONREFINE) //Packet exploit?
 		return;
-	if (pc_istrading(sd)) {
+	if (pc_istrading(sd) || pc_isdead(sd) || pc_isvending(sd)) {
 		//Make it fail to avoid shop exploits where you sell something different than you see.
 		clif->skill_fail(sd, sd->ud.skill_id, USESKILL_FAIL_LEVEL, 0, 0);
 		clif_menuskill_clear(sd);
 		return;
 	}
-	idx = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
+	int idx = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	skill->weaponrefine(sd, idx-2);
 	clif_menuskill_clear(sd);
 }
@@ -12857,6 +12916,9 @@ static void clif_parse_NpcSelectMenu(int fd, struct map_session_data *sd) __attr
 ///     overflows to choice%256.
 static void clif_parse_NpcSelectMenu(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int npc_id = RFIFOL(fd,2);
 	uint8 select = RFIFOB(fd,6);
 
@@ -12882,6 +12944,9 @@ static void clif_parse_NpcNextClicked(int fd, struct map_session_data *sd) __att
 /// 00b9 <npc id>.L
 static void clif_parse_NpcNextClicked(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	npc->scriptcont(sd,RFIFOL(fd,2), false);
 }
 
@@ -12890,6 +12955,9 @@ static void clif_parse_NpcAmountInput(int fd, struct map_session_data *sd) __att
 /// 0143 <npc id>.L <value>.L
 static void clif_parse_NpcAmountInput(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int npcid = RFIFOL(fd,2);
 	int amount = RFIFOL(fd,6);
 
@@ -12914,6 +12982,9 @@ static void clif_parse_NpcStringInput(int fd, struct map_session_data *sd) __att
 /// 01d5 <packet len>.W <npc id>.L <string>.?B
 static void clif_parse_NpcStringInput(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int len = RFIFOW(fd, 2);
 // [4144] can't confirm exact client version. At least >= correct for 20150513
 #if PACKETVER >= 20151029
@@ -12941,6 +13012,8 @@ static void clif_parse_NpcCloseClicked(int fd, struct map_session_data *sd)
 {
 	if (!sd->npc_id) //Avoid parsing anything when the script was done with. [Skotlex]
 		return;
+	if (sd->state.trading || pc_isvending(sd))
+		return;
 	sd->state.dialog = 0;
 	npc->scriptcont(sd, RFIFOL(fd,2), true);
 }
@@ -12952,6 +13025,9 @@ static void clif_parse_ItemIdentify(int fd, struct map_session_data *sd) __attri
 ///     -1 = cancel
 static void clif_parse_ItemIdentify(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	short idx = RFIFOW(fd,2);
 
 	if (sd->menuskill_id != MC_IDENTIFY)
@@ -12970,6 +13046,9 @@ static void clif_parse_ItemIdentify(int fd, struct map_session_data *sd)
 /// 0A35 <index>.W
 static void clif_parse_OneClick_ItemIdentify(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int cmd = RFIFOW(fd,0);
 	short idx = RFIFOW(fd, packet_db[cmd].pos[0]) - 2;
 	int n;
@@ -12977,7 +13056,7 @@ static void clif_parse_OneClick_ItemIdentify(int fd, struct map_session_data *sd
 	if (idx < 0 || idx >= sd->status.inventorySize || sd->inventory_data[idx] == NULL || sd->status.inventory[idx].nameid <= 0)
 		return;
 
-	if ((n = pc->have_magnifier(sd) ) != INDEX_NOT_FOUND &&
+	if ((n = pc->have_magnifier(sd)) != INDEX_NOT_FOUND &&
 		pc->delitem(sd, n, 1, 0, DELITEM_NORMAL, LOG_TYPE_CONSUME) == 0)
 		skill->identify(sd, idx);
 }
@@ -12988,7 +13067,7 @@ static void clif_parse_SelectArrow(int fd, struct map_session_data *sd) __attrib
 static void clif_parse_SelectArrow(int fd, struct map_session_data *sd)
 {
 	int itemId;
-	if (pc_istrading(sd)) {
+	if (pc_istrading(sd) || pc_isdead(sd) || pc_isvending(sd)) {
 		//Make it fail to avoid shop exploits where you sell something different than you see.
 		clif->skill_fail(sd, sd->ud.skill_id, USESKILL_FAIL_LEVEL, 0, 0);
 		clif_menuskill_clear(sd);
@@ -13025,6 +13104,9 @@ static void clif_parse_AutoSpell(int fd, struct map_session_data *sd) __attribut
 /// 01ce <skill id>.L
 static void clif_parse_AutoSpell(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	uint16 skill_id = RFIFOL(fd,2);
 
 	sd->state.workinprogress = 0;
@@ -13044,6 +13126,9 @@ static void clif_parse_UseCard(int fd, struct map_session_data *sd) __attribute_
 /// 017a <card index>.W
 static void clif_parse_UseCard(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	clif->use_card(sd,RFIFOW(fd,2)-2);
 }
 
@@ -13052,6 +13137,9 @@ static void clif_parse_InsertCard(int fd, struct map_session_data *sd) __attribu
 /// 017c <card index>.W <equip index>.W
 static void clif_parse_InsertCard(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	pc->insert_card(sd,RFIFOW(fd,2)-2,RFIFOW(fd,4)-2);
 }
 
@@ -13077,6 +13165,9 @@ static void clif_parse_ResetChar(int fd, struct map_session_data *sd) __attribut
 ///     1 = skill
 static void clif_parse_ResetChar(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	char cmd[15];
 
 	if( RFIFOW(fd,2) )
@@ -13262,6 +13353,9 @@ static void clif_parse_CreateParty(int fd, struct map_session_data *sd) __attrib
 /// 01e8 <party name>.24B <item pickup rule>.B <item share rule>.B (CZ_MAKE_GROUP2)
 static void clif_parse_CreateParty(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	char name[NAME_LENGTH];
 
 	safestrncpy(name, RFIFOP(fd,2), NAME_LENGTH);
@@ -13282,6 +13376,9 @@ static void clif_parse_CreateParty(int fd, struct map_session_data *sd)
 static void clif_parse_CreateParty2(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_CreateParty2(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	char name[NAME_LENGTH];
 	int item1 = RFIFOB(fd,26);
 	int item2 = RFIFOB(fd,27);
@@ -13307,6 +13404,9 @@ static void clif_parse_PartyInvite(int fd, struct map_session_data *sd) __attrib
 /// 02c4 <char name>.24B (CZ_PARTY_JOIN_REQ)
 static void clif_parse_PartyInvite(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	struct map_session_data *t_sd;
 
 	if(map->list[sd->bl.m].flag.partylock) {
@@ -13328,6 +13428,9 @@ static void clif_parse_PartyInvite(int fd, struct map_session_data *sd)
 static void clif_parse_PartyInvite2(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_PartyInvite2(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	struct map_session_data *t_sd;
 	char name[NAME_LENGTH];
 
@@ -13358,13 +13461,23 @@ static void clif_parse_ReplyPartyInvite(int fd, struct map_session_data *sd) __a
 ///     1 = accept
 static void clif_parse_ReplyPartyInvite(int fd, struct map_session_data *sd)
 {
-	party->reply_invite(sd,RFIFOL(fd,2),RFIFOL(fd,6));
+	if (pc_istrading(sd) || pc_isvending(sd)) {
+		party->reply_invite(sd, RFIFOL(fd, 2), 0);
+		return;
+	}
+
+	party->reply_invite(sd, RFIFOL(fd, 2), RFIFOL(fd, 6));
 }
 
 static void clif_parse_ReplyPartyInvite2(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_ReplyPartyInvite2(int fd, struct map_session_data *sd)
 {
-	party->reply_invite(sd,RFIFOL(fd,2),RFIFOB(fd,6));
+	if (pc_istrading(sd) || pc_isvending(sd)) {
+		party->reply_invite(sd, RFIFOL(fd, 2), 0);
+		return;
+	}
+
+	party->reply_invite(sd, RFIFOL(fd, 2), RFIFOB(fd, 6));
 }
 
 static void clif_parse_LeaveParty(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
@@ -13372,7 +13485,10 @@ static void clif_parse_LeaveParty(int fd, struct map_session_data *sd) __attribu
 /// 0100
 static void clif_parse_LeaveParty(int fd, struct map_session_data *sd)
 {
-	if(map->list[sd->bl.m].flag.partylock) {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
+	if (map->list[sd->bl.m].flag.partylock) {
 		// Party locked.
 		clif->message(fd, msg_fd(fd,227)); // Party modification is disabled in this map.
 		return;
@@ -13385,12 +13501,15 @@ static void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd) __
 /// 0103 <account id>.L <char name>.24B
 static void clif_parse_RemovePartyMember(int fd, struct map_session_data *sd)
 {
-	if(map->list[sd->bl.m].flag.partylock) {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
+	if (map->list[sd->bl.m].flag.partylock) {
 		// Party locked.
 		clif->message(fd, msg_fd(fd,227)); // Party modification is disabled in this map.
 		return;
 	}
-	party->removemember(sd, RFIFOL(fd,2), RFIFOP(fd,6));
+	party->removemember(sd, RFIFOL(fd, 2), RFIFOP(fd, 6));
 }
 
 static void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
@@ -13399,6 +13518,9 @@ static void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd) __
 /// 07d7 <exp share rule>.L <item pickup rule>.B <item share rule>.B (CZ_GROUPINFO_CHANGE_V2)
 static void clif_parse_PartyChangeOption(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	struct party_data *p;
 	int i;
 
@@ -13451,6 +13573,9 @@ static void clif_parse_PartyChangeLeader(int fd, struct map_session_data *sd) __
 /// 07da <account id>.L
 static void clif_parse_PartyChangeLeader(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	party->changeleader(sd, map->id2sd(RFIFOL(fd,2)));
 }
 
@@ -13463,6 +13588,9 @@ static void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data *
 static void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data *sd)
 {
 #ifndef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	short level = RFIFOW(fd,2);
 	short mapid = RFIFOW(fd,4);
 	short job[PARTY_BOOKING_JOBS];
@@ -13505,6 +13633,9 @@ static void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data *sd
 static void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data *sd)
 {
 #ifndef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	short level = RFIFOW(fd,2);
 	short mapid = RFIFOW(fd,4);
 	short job = RFIFOW(fd,6);
@@ -13556,7 +13687,10 @@ static void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data *sd
 static void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data *sd)
 {
 #ifndef PARTY_RECRUIT
-	if(party->booking_delete(sd))
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
+	if (party->booking_delete(sd))
 		clif->PartyBookingDeleteAck(sd, 0);
 #else
 	return;
@@ -13592,11 +13726,13 @@ static void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data *sd
 static void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data *sd)
 {
 #ifndef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	short job[PARTY_BOOKING_JOBS];
-	int i;
 
-	for(i=0; i<PARTY_BOOKING_JOBS; i++)
-		job[i] = RFIFOW(fd,2+i*2);
+	for (int i = 0; i < PARTY_BOOKING_JOBS; i++)
+		job[i] = RFIFOW(fd, 2 + i * 2);
 
 	party->booking_update(sd, job);
 #else
@@ -13609,8 +13745,11 @@ static void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data *sd
 static void clif_PartyBookingInsertNotify(struct map_session_data *sd, struct party_booking_ad_info *pb_ad)
 {
 #ifndef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	int i;
-	uint8 buf[38+PARTY_BOOKING_JOBS*2];
+	uint8 buf[38 + PARTY_BOOKING_JOBS * 2];
 
 	nullpo_retv(sd);
 	if(pb_ad == NULL) return;
@@ -13677,7 +13816,10 @@ static void clif_parse_PartyRecruitRegisterReq(int fd, struct map_session_data *
 static void clif_parse_PartyRecruitRegisterReq(int fd, struct map_session_data *sd)
 {
 #ifdef PARTY_RECRUIT
-	short level = RFIFOW(fd,2);
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
+	short level = RFIFOW(fd, 2);
 	const char *notice = RFIFOP(fd, 4);
 
 	party->recruit_register(sd, level, notice);
@@ -13748,6 +13890,9 @@ static void clif_parse_PartyRecruitSearchReq(int fd, struct map_session_data *sd
 static void clif_parse_PartyRecruitSearchReq(int fd, struct map_session_data *sd)
 {
 #ifdef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	short level = RFIFOW(fd, 2);
 	short mapid = RFIFOW(fd, 4);
 	unsigned long lastindex = RFIFOL(fd, 6);
@@ -13765,7 +13910,10 @@ static void clif_parse_PartyRecruitDeleteReq(int fd, struct map_session_data *sd
 static void clif_parse_PartyRecruitDeleteReq(int fd, struct map_session_data *sd)
 {
 #ifdef PARTY_RECRUIT
-	if(party->booking_delete(sd))
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
+	if (party->booking_delete(sd))
 		clif->PartyRecruitDeleteAck(sd, 0);
 #else
 	return;
@@ -13801,6 +13949,9 @@ static void clif_parse_PartyRecruitUpdateReq(int fd, struct map_session_data *sd
 static void clif_parse_PartyRecruitUpdateReq(int fd, struct map_session_data *sd)
 {
 #ifdef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	const char *notice = RFIFOP(fd, 2);
 
 	party->recruit_update(sd, notice);
@@ -13874,6 +14025,9 @@ static void clif_parse_PartyBookingAddFilteringList(int fd, struct map_session_d
 static void clif_parse_PartyBookingAddFilteringList(int fd, struct map_session_data *sd)
 {
 #ifdef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	int index = RFIFOL(fd, 2);
 
 	clif->PartyBookingAddFilteringList(index, sd);
@@ -13888,6 +14042,9 @@ static void clif_parse_PartyBookingSubFilteringList(int fd, struct map_session_d
 static void clif_parse_PartyBookingSubFilteringList(int fd, struct map_session_data *sd)
 {
 #ifdef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	int gid = RFIFOL(fd, 2);
 
 	clif->PartyBookingSubFilteringList(gid, sd);
@@ -13902,6 +14059,9 @@ static void clif_parse_PartyBookingReqVolunteer(int fd, struct map_session_data
 static void clif_parse_PartyBookingReqVolunteer(int fd, struct map_session_data *sd)
 {
 #ifdef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	int index = RFIFOL(fd, 2);
 
 	clif->PartyBookingVolunteerInfo(index, sd);
@@ -13978,6 +14138,9 @@ static void clif_parse_PartyBookingRefuseVolunteer(int fd, struct map_session_da
 static void clif_parse_PartyBookingRefuseVolunteer(int fd, struct map_session_data *sd)
 {
 #ifdef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	unsigned int aid = RFIFOL(fd, 2);
 
 	clif->PartyBookingRefuseVolunteer(aid, sd);
@@ -14007,6 +14170,9 @@ static void clif_parse_PartyBookingCancelVolunteer(int fd, struct map_session_da
 static void clif_parse_PartyBookingCancelVolunteer(int fd, struct map_session_data *sd)
 {
 #ifdef PARTY_RECRUIT
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	int index = RFIFOL(fd, 2);
 
 	clif->PartyBookingCancelVolunteer(index, sd);
@@ -14082,6 +14248,9 @@ static void clif_parse_CloseVending(int fd, struct map_session_data *sd) __attri
 /// 012e
 static void clif_parse_CloseVending(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isdead(sd))
+		return;
+
 	vending->close(sd);
 }
 
@@ -14090,6 +14259,9 @@ static void clif_parse_VendingListReq(int fd, struct map_session_data *sd) __att
 /// 0130 <account id>.L
 static void clif_parse_VendingListReq(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isdead(sd))
+		return;
+
 	if( sd->npc_id ) {// using an NPC
 		return;
 	}
@@ -14101,6 +14273,9 @@ static void clif_parse_PurchaseReq(int fd, struct map_session_data *sd) __attrib
 /// 0134 <packet len>.W <account id>.L { <amount>.W <index>.W }*
 static void clif_parse_PurchaseReq(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int len = (int)RFIFOW(fd, 2) - 8;
 	int id;
 	const uint8 *data;
@@ -14122,6 +14297,9 @@ static void clif_parse_PurchaseReq2(int fd, struct map_session_data *sd) __attri
 /// 0801 <packet len>.W <account id>.L <unique id>.L { <amount>.W <index>.W }*
 static void clif_parse_PurchaseReq2(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int len = (int)RFIFOW(fd, 2) - 12;
 	int aid;
 	int uid;
@@ -14148,25 +14326,25 @@ static void clif_parse_OpenVending(int fd, struct map_session_data *sd) __attrib
 ///     1 = open
 static void clif_parse_OpenVending(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isdead(sd) || sd->state.vending || sd->state.buyingstore)
+		return;
+
 	int len = (int)RFIFOW(fd, 2) - 85;
-	const char *message;
-	bool flag;
-	const uint8 *data;
 
 	if (len < 0)
 		return;
 
-	message = RFIFOP(fd,4);
-	flag = (RFIFOB(fd,84) != 0) ? true : false;
-	data = RFIFOP(fd,85);
+	const char *message = RFIFOP(fd, 4);
+	bool flag = (RFIFOB(fd, 84) != 0) ? true : false;
+	const uint8 *data = RFIFOP(fd, 85);
 
-	if( !flag )
+	if (!flag)
 		sd->state.prevend = sd->state.workinprogress = 0;
 
-	if(pc_ismuted(&sd->sc, MANNER_NOROOM))
+	if (pc_ismuted(&sd->sc, MANNER_NOROOM))
 		return;
-	if( map->list[sd->bl.m].flag.novending ) {
-		clif->message (sd->fd, msg_sd(sd,276)); // "You can't open a shop on this map"
+	if (map->list[sd->bl.m].flag.novending) {
+		clif->message (sd->fd, msg_sd(sd, 276)); // "You can't open a shop on this map"
 		return;
 	}
 	if (map->getcell(sd->bl.m, &sd->bl, sd->bl.x, sd->bl.y, CELL_CHKNOVENDING)) {
@@ -14185,11 +14363,14 @@ static void clif_parse_CreateGuild(int fd, struct map_session_data *sd) __attrib
 /// 0165 <char id>.L <guild name>.24B
 static void clif_parse_CreateGuild(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	char name[NAME_LENGTH];
 	safestrncpy(name, RFIFOP(fd,6), NAME_LENGTH);
 
-	if(map->list[sd->bl.m].flag.guildlock) {
-		clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map.
+	if (map->list[sd->bl.m].flag.guildlock) {
+		clif->message(fd, msg_fd(fd, 228)); // Guild modification is disabled in this map.
 		return;
 	}
 
@@ -14250,6 +14431,9 @@ static void clif_parse_GuildChangePositionInfo(int fd, struct map_session_data *
 /// 0161 <packet len>.W { <position id>.L <mode>.L <ranking>.L <pay rate>.L <name>.24B }*
 static void clif_parse_GuildChangePositionInfo(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int i;
 	int count = (RFIFOW(fd, 2) - 4) / 40;
 
@@ -14267,6 +14451,9 @@ static void clif_parse_GuildChangeMemberPosition(int fd, struct map_session_data
 /// 0155 <packet len>.W { <account id>.L <char id>.L <position id>.L }*
 static void clif_parse_GuildChangeMemberPosition(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int i;
 	int len = RFIFOW(fd, 2);
 	int count = (len - 4) / 12;
@@ -14432,10 +14619,13 @@ static void clif_parse_GuildChangeEmblem(int fd, struct map_session_data *sd) __
 /// 0153 <packet len>.W <emblem data>.?B
 static void clif_parse_GuildChangeEmblem(int fd, struct map_session_data *sd)
 {
-	unsigned int emblem_len = RFIFOW(fd,2)-4;
-	const uint8* emblem = RFIFOP(fd,4);
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	unsigned int emblem_len = RFIFOW(fd, 2) - 4;
+	const uint8* emblem = RFIFOP(fd, 4);
 
-	if( !emblem_len || !sd->state.gmaster_flag )
+	if (!emblem_len || !sd->state.gmaster_flag)
 		return;
 
 	if (!clif->validate_emblem(emblem, emblem_len)) {
@@ -14452,7 +14642,10 @@ static void clif_parse_GuildChangeNotice(int fd, struct map_session_data *sd) __
 /// 016e <guild id>.L <msg1>.60B <msg2>.120B
 static void clif_parse_GuildChangeNotice(int fd, struct map_session_data *sd)
 {
-	int guild_id = RFIFOL(fd,2);
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	int guild_id = RFIFOL(fd, 2);
 	char *msg1 = NULL, *msg2 = NULL;
 
 	if (!sd->state.gmaster_flag)
@@ -14504,6 +14697,9 @@ static void clif_parse_GuildInvite(int fd, struct map_session_data *sd) __attrib
 /// 0168 <account id>.L <inviter account id>.L <inviter char id>.L
 static void clif_parse_GuildInvite(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct map_session_data *t_sd = map->id2sd(RFIFOL(fd,2));
 
 	if (!clif_sub_guild_invite(fd, sd, t_sd))
@@ -14532,7 +14728,7 @@ static void clif_parse_GuildReplyInvite(int fd, struct map_session_data *sd) __a
 ///     1 = accept
 static void clif_parse_GuildReplyInvite(int fd, struct map_session_data *sd)
 {
-	guild->reply_invite(sd,RFIFOL(fd,2),RFIFOL(fd,6));
+	guild->reply_invite(sd, RFIFOL(fd, 2), RFIFOL(fd, 6));
 }
 
 static void clif_parse_GuildLeave(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
@@ -14540,16 +14736,19 @@ static void clif_parse_GuildLeave(int fd, struct map_session_data *sd) __attribu
 /// 0159 <guild id>.L <account id>.L <char id>.L <reason>.40B
 static void clif_parse_GuildLeave(int fd, struct map_session_data *sd)
 {
-	if(map->list[sd->bl.m].flag.guildlock) {
-		clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map.
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	if (map->list[sd->bl.m].flag.guildlock) {
+		clif->message(fd, msg_fd(fd, 228)); // Guild modification is disabled in this map.
 		return;
 	}
-	if( sd->bg_id ) {
-		clif->message(fd, msg_fd(fd,870)); //"You can't leave battleground guilds."
+	if (sd->bg_id) {
+		clif->message(fd, msg_fd(fd, 870)); //"You can't leave battleground guilds."
 		return;
 	}
 
-	guild->leave(sd,RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOP(fd,14));
+	guild->leave(sd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10), RFIFOP(fd, 14));
 }
 
 static void clif_parse_GuildExpulsion(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
@@ -14557,11 +14756,14 @@ static void clif_parse_GuildExpulsion(int fd, struct map_session_data *sd) __att
 /// 015b <guild id>.L <account id>.L <char id>.L <reason>.40B
 static void clif_parse_GuildExpulsion(int fd, struct map_session_data *sd)
 {
-	if( map->list[sd->bl.m].flag.guildlock || sd->bg_id ) {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	if (map->list[sd->bl.m].flag.guildlock || sd->bg_id) {
 		clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map.
 		return;
 	}
-	guild->expulsion(sd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOP(fd,14));
+	guild->expulsion(sd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOL(fd, 10), RFIFOP(fd, 14));
 }
 
 /**
@@ -14594,6 +14796,9 @@ static void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd)
 /// 0170 <account id>.L <inviter account id>.L <inviter char id>.L
 static void clif_parse_GuildRequestAlliance(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct map_session_data *t_sd;
 
 	if(!sd->state.gmaster_flag)
@@ -14634,6 +14839,9 @@ static void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd) __a
 ///     1 = Enemy
 static void clif_parse_GuildDelAlliance(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	if(!sd->state.gmaster_flag)
 		return;
 
@@ -14649,6 +14857,9 @@ static void clif_parse_GuildOpposition(int fd, struct map_session_data *sd) __at
 /// 0180 <account id>.L
 static void clif_parse_GuildOpposition(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct map_session_data *t_sd;
 
 	if(!sd->state.gmaster_flag)
@@ -14678,6 +14889,9 @@ static void clif_parse_GuildBreak(int fd, struct map_session_data *sd) __attribu
 ///     field name and size is same as the one in CH_DELETE_CHAR.
 static void clif_parse_GuildBreak(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	char key[40];
 	if( map->list[sd->bl.m].flag.guildlock ) {
 		clif->message(fd, msg_fd(fd,228)); // Guild modification is disabled in this map.
@@ -14701,7 +14915,10 @@ static void clif_parse_PetMenu(int fd, struct map_session_data *sd) __attribute_
 ///     4 = unequip accessory
 static void clif_parse_PetMenu(int fd, struct map_session_data *sd)
 {
-	pet->menu(sd,RFIFOB(fd,2));
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	pet->menu(sd, RFIFOB(fd, 2));
 }
 
 static void clif_parse_CatchPet(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
@@ -14709,7 +14926,10 @@ static void clif_parse_CatchPet(int fd, struct map_session_data *sd) __attribute
 /// 019f <id>.L
 static void clif_parse_CatchPet(int fd, struct map_session_data *sd)
 {
-	pet->catch_process2(sd,RFIFOL(fd,2));
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	pet->catch_process2(sd, RFIFOL(fd, 2));
 }
 
 static void clif_parse_SelectEgg(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
@@ -14717,10 +14937,13 @@ static void clif_parse_SelectEgg(int fd, struct map_session_data *sd) __attribut
 /// 01a7 <index>.W
 static void clif_parse_SelectEgg(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	if (sd->menuskill_id != SA_TAMINGMONSTER || sd->menuskill_val != -1) {
 		return;
 	}
-	pet->select_egg(sd,RFIFOW(fd,2)-2);
+	pet->select_egg(sd, RFIFOW(fd, 2) - 2);
 	clif_menuskill_clear(sd);
 }
 
@@ -14760,6 +14983,9 @@ static void clif_parse_ChangePetName(int fd, struct map_session_data *sd) __attr
 /// 01a5 <name>.24B
 static void clif_parse_ChangePetName(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	pet->change_name(sd, RFIFOP(fd,2));
 }
 
@@ -14768,6 +14994,9 @@ static void clif_parse_pet_evolution(int fd, struct map_session_data *sd) __attr
 /// 09fb <Length>.W <EvolvedPetEggID>.W {<index>.W <amount>.W}*items
 static void clif_parse_pet_evolution(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_PET_EVOLUTION *p = RP2PTR(fd);
 	int i = 0, idx, petIndex;
 
@@ -14956,7 +15185,7 @@ static void clif_parse_GMShift(int fd, struct map_session_data *sd)
 {
 	// FIXME: remove is supposed to receive account name for clients prior 20100803RE
 	char player_name[NAME_LENGTH];
-	char command[NAME_LENGTH+8];
+	char command[NAME_LENGTH + 20];
 
 	safestrncpy(player_name, RFIFOP(fd,2), NAME_LENGTH);
 
@@ -14975,7 +15204,7 @@ static void clif_parse_GMRemove2(int fd, struct map_session_data *sd)
 
 	account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	if( (pl_sd = map->id2sd(account_id)) != NULL ) {
-		char command[NAME_LENGTH+8];
+		char command[NAME_LENGTH + 20];
 		sprintf(command, "%cjumpto %s", atcommand->at_symbol, pl_sd->status.name);
 		atcommand->exec(fd, sd, command, true);
 	}
@@ -15012,7 +15241,7 @@ static void clif_parse_GMRecall2(int fd, struct map_session_data *sd)
 
 	account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
 	if( (pl_sd = map->id2sd(account_id)) != NULL ) {
-		char command[NAME_LENGTH+8];
+		char command[NAME_LENGTH + 20];
 		sprintf(command, "%crecall %s", atcommand->at_symbol, pl_sd->status.name);
 		atcommand->exec(fd, sd, command, true);
 	}
@@ -15343,6 +15572,9 @@ static void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd) __att
 /// 01e7
 static void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	if (sd->state.doridori) return;
 
 	switch (sd->job & MAPID_UPPERMASK) {
@@ -15369,6 +15601,9 @@ static void clif_parse_NoviceExplosionSpirits(int fd, struct map_session_data *s
 ///       "Help me out~ Please~ T_T"
 static void clif_parse_NoviceExplosionSpirits(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	/* [Ind/Hercules] */
 	/* game client is currently broken on this (not sure the packetver range) */
 	/* it sends the request when the criteria doesn't match (and of course we let it fail) */
@@ -15512,6 +15747,9 @@ static void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd) __att
 /// 0202 <name>.24B
 static void clif_parse_FriendsListAdd(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct map_session_data *f_sd;
 	int i;
 	char nick[NAME_LENGTH];
@@ -15633,6 +15871,9 @@ static void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd) __
 /// 0203 <account id>.L <char id>.L
 static void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct map_session_data *f_sd = NULL;
 	int account_id, char_id;
 	int i, j;
@@ -15724,7 +15965,7 @@ static void clif_parse_PVPInfo(int fd, struct map_session_data *sd)
 /// ranking pointlist  { <name>.24B <point>.L }*10
 static void clif_ranklist_sub(struct PACKET_ZC_ACK_RANKING_sub *ranks, enum fame_list_type type)
 {
-#if !(PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724)
+#if !(PACKETVER_MAIN_NUM >= 20190731 || PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724)
 	nullpo_retv(ranks);
 
 	struct fame_list* list;
@@ -15759,7 +16000,7 @@ static void clif_ranklist_sub(struct PACKET_ZC_ACK_RANKING_sub *ranks, enum fame
 
 static void clif_ranklist_sub2(uint32 *chars, uint32 *points, enum fame_list_type type)
 {
-#if PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724
+#if PACKETVER_MAIN_NUM >= 20190731 || PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724
 	nullpo_retv(chars);
 	nullpo_retv(points);
 
@@ -15798,7 +16039,7 @@ static void clif_ranklist(struct map_session_data *sd, enum fame_list_type type)
 	struct PACKET_ZC_ACK_RANKING *p = WFIFOP(fd, 0);
 	p->packetType = HEADER_ZC_ACK_RANKING;
 	p->rankType = type;
-#if PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724
+#if PACKETVER_MAIN_NUM >= 20190731 || PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724
 	clif->ranklist_sub2(p->chars, p->points, type);
 #else
 	clif->ranklist_sub(p->ranks, type);
@@ -16007,6 +16248,9 @@ static void clif_parse_FeelSaveOk(int fd, struct map_session_data *sd) __attribu
 ///     2 = star
 static void clif_parse_FeelSaveOk(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int i;
 	if (sd->menuskill_id != SG_FEEL)
 		return;
@@ -16048,6 +16292,9 @@ static void clif_parse_ChangeHomunculusName(int fd, struct map_session_data *sd)
 /// 0231 <name>.24B
 static void clif_parse_ChangeHomunculusName(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	homun->change_name(sd, RFIFOP(fd,2));
 }
 
@@ -16056,6 +16303,9 @@ static void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd) __at
 /// 0234 <id>.L
 static void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int id = RFIFOL(fd,2); // Mercenary or Homunculus
 	struct block_list *bl = NULL;
 	struct unit_data *ud = NULL;
@@ -16077,6 +16327,9 @@ static void clif_parse_HomMoveTo(int fd, struct map_session_data *sd) __attribut
 /// 0232 <id>.L <position data>.3B
 static void clif_parse_HomMoveTo(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int id = RFIFOL(fd,2); // Mercenary or Homunculus
 	struct block_list *bl = NULL;
 	short x, y;
@@ -16100,6 +16353,9 @@ static void clif_parse_HomAttack(int fd, struct map_session_data *sd) __attribut
 ///     always 0
 static void clif_parse_HomAttack(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct block_list *bl = NULL;
 	int id = RFIFOL(fd,2),
 		target_id = RFIFOL(fd,6),
@@ -16126,6 +16382,9 @@ static void clif_parse_HomMenu(int fd, struct map_session_data *sd) __attribute_
 ///     2 = delete
 static void clif_parse_HomMenu(int fd, struct map_session_data *sd)
 { //[orn]
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int cmd;
 
 	cmd = RFIFOW(fd,0);
@@ -16141,6 +16400,11 @@ static void clif_parse_AutoRevive(int fd, struct map_session_data *sd) __attribu
 /// 0292
 static void clif_parse_AutoRevive(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+	if (!pc_isdead(sd))
+		return;
+
 	int item_position = pc->search_inventory(sd, ITEMID_TOKEN_OF_SIEGFRIED);
 	int hpsp = 100;
 
@@ -16162,7 +16426,7 @@ static void clif_parse_AutoRevive(int fd, struct map_session_data *sd)
 	else
 		pc->delitem(sd, item_position, 1, 0, DELITEM_SKILLUSE, LOG_TYPE_CONSUME);
 
-	clif->skill_nodamage(&sd->bl,&sd->bl,ALL_RESURRECTION,4,1);
+	clif->skill_nodamage(&sd->bl,&sd->bl,ALL_RESURRECTION, 4, 1);
 }
 
 /// Information about character's status values (ZC_ACK_STATUS_GM).
@@ -16212,6 +16476,9 @@ static void clif_parse_Check(int fd, struct map_session_data *sd) __attribute__(
 /// 0213 <char name>.24B
 static void clif_parse_Check(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isvending(sd))
+		return;
+
 	char charname[NAME_LENGTH];
 	struct map_session_data* pl_sd;
 
@@ -16374,6 +16641,9 @@ static void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd) __
 /// 023f
 static void clif_parse_Mail_refreshinbox(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct mail_data* md = &sd->mail.inbox;
 
 	if( md->amount < MAIL_MAX_INBOX && (md->full || sd->mail.changed) )
@@ -16457,6 +16727,9 @@ static void clif_parse_Mail_read(int fd, struct map_session_data *sd) __attribut
 /// 0241 <mail id>.L
 static void clif_parse_Mail_read(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int mail_id = RFIFOL(fd,2);
 
 	if( mail_id <= 0 )
@@ -16472,6 +16745,9 @@ static void clif_parse_Mail_getattach(int fd, struct map_session_data *sd) __att
 /// 0244 <mail id>.L
 static void clif_parse_Mail_getattach(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int mail_id = RFIFOL(fd,2);
 	int i;
 
@@ -16540,6 +16816,9 @@ static void clif_parse_Mail_delete(int fd, struct map_session_data *sd) __attrib
 /// 0243 <mail id>.L
 static void clif_parse_Mail_delete(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int mail_id = RFIFOL(fd,2);
 	int i;
 
@@ -16571,6 +16850,9 @@ static void clif_parse_Mail_return(int fd, struct map_session_data *sd) __attrib
 /// 0273 <mail id>.L <receive name>.24B
 static void clif_parse_Mail_return(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int mail_id = RFIFOL(fd,2);
 	int i;
 
@@ -16595,6 +16877,9 @@ static void clif_parse_Mail_setattach(int fd, struct map_session_data *sd) __att
 /// 0247 <index>.W <amount>.L
 static void clif_parse_Mail_setattach(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int idx = RFIFOW(fd,2);
 	int amount = RFIFOL(fd,4);
 	unsigned char flag;
@@ -16617,6 +16902,9 @@ static void clif_parse_Mail_winopen(int fd, struct map_session_data *sd) __attri
 ///     2 = remove zeny
 static void clif_parse_Mail_winopen(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int flag = RFIFOW(fd,2);
 
 	if (flag == 0 || flag == 1)
@@ -16631,6 +16919,9 @@ static void clif_parse_Mail_send(int fd, struct map_session_data *sd) __attribut
 
 static void clif_parse_Mail_send(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct mail_message msg;
 	int body_len;
 	int len = RFIFOW(fd, 2);
@@ -16787,7 +17078,10 @@ static void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd) __
 ///     ? = junk, uninitialized value (ex. when switching between list filters)
 static void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd)
 {
-	if( sd->auction.amount > 0 )
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	if (sd->auction.amount > 0)
 		clif->additem(sd, sd->auction.index, sd->auction.amount, 0);
 
 	sd->auction.amount = 0;
@@ -16798,8 +17092,11 @@ static void clif_parse_Auction_setitem(int fd, struct map_session_data *sd) __at
 /// 024c <index>.W <count>.L
 static void clif_parse_Auction_setitem(int fd, struct map_session_data *sd)
 {
-	int idx = RFIFOW(fd,2) - 2;
-	int amount = RFIFOL(fd,4); // Always 1
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	int idx = RFIFOW(fd, 2) - 2;
+	int amount = RFIFOL(fd, 4); // Always 1
 	struct item_data *item;
 
 	if( !battle_config.feature_auction )
@@ -16877,6 +17174,9 @@ static void clif_parse_Auction_register(int fd, struct map_session_data *sd) __a
 /// 024d <now money>.L <max money>.L <delete hour>.W
 static void clif_parse_Auction_register(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct auction_data auction;
 	struct item_data *item;
 
@@ -16972,7 +17272,10 @@ static void clif_parse_Auction_cancel(int fd, struct map_session_data *sd) __att
 /// 024e <auction id>.L
 static void clif_parse_Auction_cancel(int fd, struct map_session_data *sd)
 {
-	unsigned int auction_id = RFIFOL(fd,2);
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	unsigned int auction_id = RFIFOL(fd, 2);
 
 	intif->Auction_cancel(sd->status.char_id, auction_id);
 }
@@ -16982,6 +17285,9 @@ static void clif_parse_Auction_close(int fd, struct map_session_data *sd) __attr
 /// 025d <auction id>.L
 static void clif_parse_Auction_close(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	unsigned int auction_id = RFIFOL(fd,2);
 
 	intif->Auction_close(sd->status.char_id, auction_id);
@@ -16992,8 +17298,11 @@ static void clif_parse_Auction_bid(int fd, struct map_session_data *sd) __attrib
 /// 024f <auction id>.L <money>.L
 static void clif_parse_Auction_bid(int fd, struct map_session_data *sd)
 {
-	unsigned int auction_id = RFIFOL(fd,2);
-	int bid = RFIFOL(fd,6);
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	unsigned int auction_id = RFIFOL(fd, 2);
+	int bid = RFIFOL(fd, 6);
 
 	if( !pc_can_give_items(sd) ) { //They aren't supposed to give zeny [Inkfish]
 		clif->message(sd->fd, msg_sd(sd,246)); // Your GM level doesn't authorize you to perform this action.
@@ -17024,9 +17333,12 @@ static void clif_parse_Auction_search(int fd, struct map_session_data *sd) __att
 ///     5 = auction id search
 static void clif_parse_Auction_search(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	char search_text[NAME_LENGTH];
-	short type = RFIFOW(fd,2), page = RFIFOW(fd,32);
-	int price = RFIFOL(fd,4);  // FIXME: bug #5071
+	short type = RFIFOW(fd, 2), page = RFIFOW(fd, 32);
+	int price = RFIFOL(fd, 4);  // FIXME: bug #5071
 
 	if( !battle_config.feature_auction )
 		return;
@@ -17045,7 +17357,10 @@ static void clif_parse_Auction_buysell(int fd, struct map_session_data *sd) __at
 ///     1 = buy (own bids)
 static void clif_parse_Auction_buysell(int fd, struct map_session_data *sd)
 {
-	short type = RFIFOW(fd,2) + 6;
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
+	short type = RFIFOW(fd, 2) + 6;
 
 	if( !battle_config.feature_auction )
 		return;
@@ -17155,6 +17470,9 @@ static void clif_parse_cashshop_buy(int fd, struct map_session_data *sd) __attri
 /// 0288 <packet len>.W <kafra points>.L <count>.W { <amount>.W <name id>.W }.4B*count (PACKETVER >= 20100803)
 static void clif_parse_cashshop_buy(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int fail = 0;
 	const struct PACKET_CZ_PC_BUY_CASH_POINT_ITEM *p = RFIFOP(fd, 0);
 
@@ -17247,6 +17565,9 @@ static void clif_parse_Adopt_request(int fd, struct map_session_data *sd) __attr
 /// 01f9 <account id>.L
 static void clif_parse_Adopt_request(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct map_session_data *tsd = map->id2sd(RFIFOL(fd,2)), *p_sd = map->charid2sd(sd->status.partner_id);
 
 	if( pc->can_Adopt(sd, p_sd, tsd) ) {
@@ -17263,6 +17584,9 @@ static void clif_parse_Adopt_reply(int fd, struct map_session_data *sd) __attrib
 ///     1 = accepted
 static void clif_parse_Adopt_reply(int fd, struct map_session_data *sd)
 {
+	if (pc_isdead(sd))
+		return;
+
 	int p1_id = RFIFOL(fd,2);
 	int p2_id = RFIFOL(fd,6);
 	int result = RFIFOL(fd,10);
@@ -17330,6 +17654,9 @@ static void clif_parse_ViewPlayerEquip(int fd, struct map_session_data *sd) __at
 /// 02d6 <account id>.L
 static void clif_parse_ViewPlayerEquip(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int charid = RFIFOL(fd, 2);
 	struct map_session_data* tsd = map->id2sd(charid);
 
@@ -17357,6 +17684,9 @@ static void clif_parse_cz_config(int fd, struct map_session_data *sd) __attribut
 ///         1 = enabled
 static void clif_parse_cz_config(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	enum CZ_CONFIG type = RFIFOL(fd, 2);
 	int flag = RFIFOL(fd, 6);
 
@@ -17672,6 +18002,9 @@ static void clif_parse_questStateAck(int fd, struct map_session_data *sd) __attr
 /// 02b6 <quest id>.L <active>.B
 static void clif_parse_questStateAck(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	quest->update_status(sd, RFIFOL(fd,2), RFIFOB(fd,6)?Q_ACTIVE:Q_INACTIVE);
 }
 
@@ -17891,6 +18224,9 @@ static void clif_parse_mercenary_action(int fd, struct map_session_data *sd) __a
 ///     2 = delete
 static void clif_parse_mercenary_action(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int option = RFIFOB(fd,2);
 	if (sd->md == NULL)
 		return;
@@ -18359,6 +18695,9 @@ static void clif_parse_ItemListWindowSelected(int fd, struct map_session_data *s
 /// S 07e4 <length>.w <option>.l <val>.l {<index>.w <amount>.w).4b*
 static void clif_parse_ItemListWindowSelected(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int n = ((int)RFIFOW(fd, 2) - 12) / 4;
 	int type = RFIFOL(fd,4);
 	int flag = RFIFOL(fd,8); // Button clicked: 0 = Cancel, 1 = OK
@@ -18488,6 +18827,9 @@ static void clif_parse_ReqOpenBuyingStore(int fd, struct map_session_data *sd) _
 ///     1 = open
 static void clif_parse_ReqOpenBuyingStore(int fd, struct map_session_data *sd)
 {
+	if (pc_istrading(sd) || pc_isdead(sd))
+		return;
+
 	const unsigned int blocksize = sizeof(struct PACKET_CZ_REQ_OPEN_BUYING_STORE_sub);
 	const struct PACKET_CZ_REQ_OPEN_BUYING_STORE_sub *itemlist;
 	char storename[MESSAGE_SIZE];
@@ -18651,6 +18993,9 @@ static void clif_buyingstore_disappear_entry_single(struct map_session_data *sd,
 /// 0817 <account id>.L
 static void clif_parse_ReqClickBuyingStore(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int account_id;
 
 	account_id = RFIFOL(fd,packet_db[RFIFOW(fd,0)].pos[0]);
@@ -18695,6 +19040,9 @@ static void clif_parse_ReqTradeBuyingStore(int fd, struct map_session_data *sd)
 /// 0819 <packet len>.W <account id>.L <store id>.L { <index>.W <name id>.W <amount>.W }*
 static void clif_parse_ReqTradeBuyingStore(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const unsigned int blocksize = sizeof(struct PACKET_CZ_REQ_TRADE_BUYING_STORE_sub);
 	const struct PACKET_CZ_REQ_TRADE_BUYING_STORE_sub *itemlist;
 	int account_id;
@@ -18833,6 +19181,9 @@ static void clif_parse_SearchStoreInfo(int fd, struct map_session_data *sd) __at
 ///         cannot be searched.
 static void clif_parse_SearchStoreInfo(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const unsigned int blocksize = sizeof(struct PACKET_CZ_SEARCH_STORE_INFO_item);
 	const struct PACKET_CZ_SEARCH_STORE_INFO_item* itemlist;
 	const struct PACKET_CZ_SEARCH_STORE_INFO_item* cardlist;
@@ -18981,6 +19332,9 @@ static void clif_parse_SearchStoreInfoNextPage(int fd, struct map_session_data *
 /// 0838
 static void clif_parse_SearchStoreInfoNextPage(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	searchstore->next(sd);
 }
 
@@ -19019,6 +19373,9 @@ static void clif_parse_SearchStoreInfoListItemClick(int fd, struct map_session_d
 /// 083c <account id>.L <store id>.L <nameid>.W
 static void clif_parse_SearchStoreInfoListItemClick(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_SSILIST_ITEM_CLICK *p = RFIFOP(fd, 0);
 	searchstore->click(sd, p->AID, p->storeId, p->itemId);
 }
@@ -19302,8 +19659,10 @@ static void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd) __at
  *------------------------------------------*/
 static void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
 
-	if( sd->menuskill_id != SC_AUTOSHADOWSPELL )
+	if (sd->menuskill_id != SC_AUTOSHADOWSPELL)
 		return;
 
 	if (pc_istrading(sd) || sd->state.prevend) {
@@ -19349,9 +19708,8 @@ static void clif_parse_MoveItem(int fd, struct map_session_data *sd)
 	int index;
 
 	/* can't move while dead. */
-	if(pc_isdead(sd)) {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
 		return;
-	}
 
 	index = RFIFOW(fd,2)-2;
 
@@ -19502,6 +19860,8 @@ static void clif_parse_dull(int fd, struct map_session_data *sd)
 static void clif_parse_CashShopOpen(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_CashShopOpen(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
 
 	if (map->list[sd->bl.m].flag.nocashshop) {
 		clif->messagecolor_self(fd, COLOR_RED, msg_fd(fd,1489)); //Cash Shop is disabled in this map
@@ -19524,6 +19884,9 @@ static void clif_parse_CashShopClose(int fd, struct map_session_data *sd)
 static void clif_parse_CashShopSchedule(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_CashShopSchedule(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	clif->cashShopSchedule(fd, sd);
 }
 
@@ -19561,6 +19924,9 @@ void clif_cashShopSchedule(int fd, struct map_session_data *sd)
 static void clif_parse_CashShopBuy(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_CashShopBuy(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int len = RFIFOW(fd, 2);
 	unsigned short limit, i, j;
 	unsigned int kafra_pay;
@@ -19681,6 +20047,9 @@ static void clif_parse_CashShopReqTab(int fd, struct map_session_data *sd)
 {
 // [4144] packet exists only in 2011 and was dropped after
 #if PACKETVER >= 20110222 && PACKETVER < 20120000
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	short tab = RFIFOW(fd, 2);
 	int j;
 
@@ -19835,6 +20204,9 @@ static void clif_bgqueue_notice_delete(struct map_session_data *sd, enum BATTLEG
 static void clif_parse_bgqueue_register(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_bgqueue_register(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct packet_bgqueue_register *p = RP2PTR(fd);
 	struct bg_arena *arena = NULL;
 	if( !bg->queue_on ) return; /* temp, until feature is complete */
@@ -19875,6 +20247,9 @@ static void clif_bgqueue_update_info(struct map_session_data *sd, unsigned char
 static void clif_parse_bgqueue_checkstate(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_bgqueue_checkstate(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct packet_bgqueue_checkstate *p = RP2PTR(fd);
 
 	if (sd->bg_queue.arena && sd->bg_queue.type) {
@@ -19887,6 +20262,9 @@ static void clif_parse_bgqueue_checkstate(int fd, struct map_session_data *sd)
 static void clif_parse_bgqueue_revoke_req(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_bgqueue_revoke_req(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct packet_bgqueue_revoke_req *p = RP2PTR(fd);
 
 	if( sd->bg_queue.arena )
@@ -19898,6 +20276,9 @@ static void clif_parse_bgqueue_revoke_req(int fd, struct map_session_data *sd)
 static void clif_parse_bgqueue_battlebegin_ack(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_bgqueue_battlebegin_ack(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct packet_bgqueue_battlebegin_ack *p = RP2PTR(fd);
 	struct bg_arena *arena;
 
@@ -19962,7 +20343,11 @@ static void clif_package_item_announce(struct map_session_data *sd, int nameid,
 
 	nullpo_retv(sd);
 	p.PacketType = package_item_announceType;
-	p.PacketLength = 11 + NAME_LENGTH;
+#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
+	p.PacketLength = 7 + 4 + 4 + NAME_LENGTH;
+#else
+	p.PacketLength = 7 + 2 + 2 + NAME_LENGTH;
+#endif
 	p.type = 0x0;
 	p.ItemID = nameid;
 	p.len = NAME_LENGTH;
@@ -19970,7 +20355,7 @@ static void clif_package_item_announce(struct map_session_data *sd, int nameid,
 	p.unknown = 0x2; // some strange byte, IDA shows.. BYTE3(BoxItemIDLength) = 2;
 	p.BoxItemID = containerid;
 
-	clif->send(&p,sizeof(p), &sd->bl, ALL_CLIENT);
+	clif->send(&p, p.PacketLength, &sd->bl, ALL_CLIENT);
 }
 
 /* Made Possible Thanks to Yommy! */
@@ -19988,12 +20373,13 @@ static void clif_item_drop_announce(struct map_session_data *sd, int nameid, cha
 	if (monsterName == NULL) {
 		// message: MSG_BROADCASTING_SPECIAL_ITEM_OBTAIN2
 		p.type = 0x2;
+		p.PacketLength -= NAME_LENGTH;
 	} else {
 		// message: MSG_BROADCASTING_SPECIAL_ITEM_OBTAIN
 		p.type = 0x1;
 		safestrncpy(p.monsterName, monsterName, sizeof(p.monsterName));
 	}
-	clif->send(&p, sizeof(p), &sd->bl, ALL_CLIENT);
+	clif->send(&p, p.PacketLength, &sd->bl, ALL_CLIENT);
 }
 
 /* [Ind/Hercules] special thanks to Yommy~! */
@@ -20053,6 +20439,9 @@ static void clif_cart_additem_ack(struct map_session_data *sd, int flag)
 static void clif_parse_BankDeposit(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_BankDeposit(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct packet_banking_deposit_req *p = RP2PTR(fd);
 	int money;
 
@@ -20069,6 +20458,9 @@ static void clif_parse_BankDeposit(int fd, struct map_session_data *sd)
 static void clif_parse_BankWithdraw(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_BankWithdraw(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct packet_banking_withdraw_req *p = RP2PTR(fd);
 	int money;
 
@@ -20086,6 +20478,9 @@ static void clif_parse_BankCheck(int fd, struct map_session_data *sd) __attribut
 static void clif_parse_BankCheck(int fd, struct map_session_data *sd)
 {
 #if PACKETVER >= 20130320
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct packet_banking_check p;
 
 	p.PacketType = banking_checkType;
@@ -20329,40 +20724,43 @@ static void clif_parse_NPCBarterClosed(int fd, struct map_session_data *sd)
 	sd->npc_shopid = 0;
 }
 
-static void clif_npc_market_purchase_ack(struct map_session_data *sd, const struct itemlist *item_list, unsigned char response)
+static void clif_npc_market_purchase_ack(struct map_session_data *sd, const struct itemlist *item_list, enum market_buy_result response)
 {
-#if PACKETVER >= 20131223
-	unsigned short c = 0;
-
+#if PACKETVER_MAIN_NUM >= 20131120 || PACKETVER_RE_NUM >= 20130911 || defined(PACKETVER_ZERO)
 	nullpo_retv(sd);
 	nullpo_retv(item_list);
-	npcmarket_result.PacketType = npcmarketresultackType;
-	npcmarket_result.result = response == 0 ? 1 : 0;/* find other values */
+	struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT *p = (struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT *)packet_buf;
+	p->PacketType = HEADER_ZC_NPC_MARKET_PURCHASE_RESULT;
+	p->result = response;
 
-	if (npcmarket_result.result) {
+	unsigned short c = 0;
+	if (response == MARKET_BUY_RESULT_SUCCESS) {
+		int vectorLen = VECTOR_LENGTH(*item_list);
+		int maxCount = (sizeof(packet_buf) - sizeof(struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT)) / sizeof(struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT_sub);
+		if (maxCount > vectorLen)
+			maxCount = vectorLen;
 		struct npc_data *nd = map->id2nd(sd->npc_shopid);
 		struct npc_item_list *shop = nd->u.scr.shop->item;
 		unsigned short shop_size = nd->u.scr.shop->items;
-		int i;
 
-		for (i = 0; i < VECTOR_LENGTH(*item_list); i++) {
+		for (int i = 0; i < maxCount; i++) {
 			const struct itemlist_entry *entry = &VECTOR_INDEX(*item_list, i);
 			int j;
 
-			npcmarket_result.list[i].ITID = entry->id;
-			npcmarket_result.list[i].qty  = entry->amount;
+			p->list[i].ITID = entry->id;
+			p->list[i].qty  = entry->amount;
 
-			ARR_FIND( 0, shop_size, j, entry->id == shop[j].nameid);
+			ARR_FIND(0, shop_size, j, entry->id == shop[j].nameid);
 
-			npcmarket_result.list[i].price = (j != shop_size) ? shop[j].value : 0;
+			p->list[i].price = (j != shop_size) ? shop[j].value : 0;
 
 			c++;
 		}
 	}
 
-	npcmarket_result.PacketLength = 5 + ( sizeof(npcmarket_result.list[0]) * c );;
+	p->PacketLength = sizeof(struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT) + (sizeof(struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT_sub) * c);
 
-	clif->send(&npcmarket_result,npcmarket_result.PacketLength,&sd->bl,SELF);
+	clif->send(p, p->PacketLength, &sd->bl, SELF);
 #endif
 }
 
@@ -20370,8 +20768,10 @@ static void clif_parse_NPCMarketPurchase(int fd, struct map_session_data *sd) __
 static void clif_parse_NPCMarketPurchase(int fd, struct map_session_data *sd)
 {
 #if PACKETVER >= 20131223
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct packet_npc_market_purchase *p = RP2PTR(fd);
-	int response = 0, i;
 	int count = (p->PacketLength - 4) / sizeof p->list[0];
 	struct itemlist item_list;
 
@@ -20380,7 +20780,7 @@ static void clif_parse_NPCMarketPurchase(int fd, struct map_session_data *sd)
 	VECTOR_INIT(item_list);
 	VECTOR_ENSURE(item_list, count, 1);
 
-	for (i = 0; i < count; i++) {
+	for (int i = 0; i < count; i++) {
 		struct itemlist_entry entry = { 0 };
 
 		entry.id = p->list[i].ITID;
@@ -20389,7 +20789,7 @@ static void clif_parse_NPCMarketPurchase(int fd, struct map_session_data *sd)
 		VECTOR_PUSH(item_list, entry);
 	}
 
-	response = npc->market_buylist(sd, &item_list);
+	enum market_buy_result response = npc->market_buylist(sd, &item_list);
 	clif->npc_market_purchase_ack(sd, &item_list, response);
 
 	VECTOR_CLEAR(item_list);
@@ -20414,6 +20814,9 @@ static void clif_parse_RouletteOpen(int fd, struct map_session_data *sd) __attri
 static void clif_parse_RouletteOpen(int fd, struct map_session_data *sd)
 {
 #if PACKETVER >= 20140612
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct packet_roulette_open_ack p;
 
 	if( !battle_config.feature_roulette ) {
@@ -20439,6 +20842,9 @@ static void clif_parse_RouletteInfo(int fd, struct map_session_data *sd) __attri
 static void clif_parse_RouletteInfo(int fd, struct map_session_data *sd)
 {
 #if PACKETVER >= 20140612
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	struct packet_roulette_info_ack p;
 	unsigned short i, j, count = 0;
 
@@ -20484,6 +20890,9 @@ static void clif_parse_RouletteClose(int fd, struct map_session_data *sd)
 static void clif_parse_RouletteGenerate(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_RouletteGenerate(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	unsigned char result = GENERATE_ROULETTE_SUCCESS;
 	short stage = sd->roulette.stage;
 
@@ -20543,6 +20952,8 @@ static void clif_parse_RouletteRecvItem(int fd, struct map_session_data *sd) __a
 static void clif_parse_RouletteRecvItem(int fd, struct map_session_data *sd)
 {
 #if PACKETVER >= 20140612
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
 	struct packet_roulette_itemrecv_ack p;
 
 	if( !battle_config.feature_roulette ) {
@@ -21280,6 +21691,9 @@ static void clif_achievement_send_update(int fd, struct map_session_data *sd, co
 static void clif_parse_achievement_get_reward(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_achievement_get_reward(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int ach_id = RFIFOL(fd, 2);
 	const struct achievement_data *ad = NULL;
 	struct achievement *ach = NULL;
@@ -21322,6 +21736,9 @@ static void clif_achievement_reward_ack(int fd, struct map_session_data *sd, con
 static void clif_parse_change_title(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_change_title(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	int title_id = RFIFOL(fd, 2);
 
 	if (title_id == sd->status.title_id) { // Same Title
@@ -21369,6 +21786,9 @@ static void clif_change_title_ack(int fd, struct map_session_data *sd, int title
 static void clif_parse_rodex_open_write_mail(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_open_write_mail(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_OPEN_WRITE_MAIL *rPacket = RFIFOP(fd, 0);
 	int8 result = (rodex->isenabled() == true && sd->npc_id == 0) ? 1 : 0;
 
@@ -21394,6 +21814,9 @@ static void clif_rodex_open_write_mail(int fd, const char *receiver_name, int8 r
 static void clif_parse_rodex_add_item(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_add_item(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_ADD_ITEM_TO_MAIL *rPacket = RFIFOP(fd, 0);
 	int16 idx = rPacket->index - 2;
 
@@ -21447,6 +21870,9 @@ static void clif_rodex_add_item_result(struct map_session_data *sd, int16 idx, i
 static void clif_parse_rodex_remove_item(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_remove_item(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_REMOVE_ITEM_MAIL *rPacket = RFIFOP(fd, 0);
 	int16 idx = rPacket->index - 2;
 
@@ -21519,6 +21945,9 @@ static void clif_rodex_checkname_result(struct map_session_data *sd, int char_id
 static void clif_parse_rodex_send_mail(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_send_mail(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_SEND_MAIL *rPacket = RFIFOP(fd, 0);
 	int8 result;
 
@@ -21749,6 +22178,9 @@ static void clif_rodex_send_refresh(int fd, struct map_session_data *sd, int8 op
 static void clif_parse_rodex_next_maillist(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_next_maillist(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_NEXT_MAIL_LIST *packet = RFIFOP(fd, 0);
 
 	rodex->next_page(sd, packet->opentype, packet->Lower_MailID);
@@ -21757,6 +22189,9 @@ static void clif_parse_rodex_next_maillist(int fd, struct map_session_data *sd)
 static void clif_parse_rodex_read_mail(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_read_mail(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_READ_MAIL *rPacket = RFIFOP(fd, 0);
 
 	rodex->read_mail(sd, rPacket->MailID);
@@ -21826,6 +22261,9 @@ static void clif_rodex_read_mail(struct map_session_data *sd, int8 opentype, str
 static void clif_parse_rodex_delete_mail(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_delete_mail(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_DELETE_MAIL *rPacket = RFIFOP(fd, 0);
 
 	rodex->delete_mail(sd, rPacket->MailID);
@@ -21853,6 +22291,9 @@ static void clif_rodex_delete_mail(struct map_session_data *sd, int8 opentype, i
 static void clif_parse_rodex_request_zeny(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_request_zeny(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_ZENY_FROM_MAIL *rPacket = RFIFOP(fd, 0);
 
 	rodex->get_zeny(sd, rPacket->opentype, rPacket->MailID);
@@ -21881,6 +22322,9 @@ static void clif_rodex_request_zeny(struct map_session_data *sd, int8 opentype,
 static void clif_parse_rodex_request_items(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_request_items(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_ITEM_FROM_MAIL *rPacket = RFIFOP(fd, 0);
 
 	rodex->get_items(sd, rPacket->opentype, rPacket->MailID);
@@ -21920,6 +22364,9 @@ static void clif_rodex_icon(int fd, bool show)
 static void clif_parse_rodex_refresh_maillist(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_refresh_maillist(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_REFRESH_MAIL_LIST *packet = RFIFOP(fd, 0);
 #if PACKETVER >= 20170419
 	rodex->refresh(sd, RODEX_OPENTYPE_UNSET, packet->Upper_MailID);
@@ -21931,6 +22378,9 @@ static void clif_parse_rodex_refresh_maillist(int fd, struct map_session_data *s
 static void clif_parse_rodex_open_mailbox(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_open_mailbox(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_OPEN_MAIL *packet = RFIFOP(fd, 0);
 #if PACKETVER >= 20170419
 	rodex->open(sd, RODEX_OPENTYPE_UNSET, packet->char_Upper_MailID);
@@ -21943,6 +22393,9 @@ static void clif_parse_rodex_open_mailbox(int fd, struct map_session_data *sd)
 static void clif_parse_rodex_close_mailbox(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_close_mailbox(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	rodex->clean(sd, 0);
 	intif->rodex_checkhasnew(sd);
 }
@@ -21950,6 +22403,9 @@ static void clif_parse_rodex_close_mailbox(int fd, struct map_session_data *sd)
 static void clif_parse_rodex_cancel_write_mail(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_rodex_cancel_write_mail(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	rodex->clean(sd, 1);
 }
 
@@ -22108,8 +22564,10 @@ static time_t clif_attendance_getendtime(void)
 static void clif_parse_open_ui_request(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_open_ui_request(int fd, struct map_session_data *sd)
 {
-	const struct PACKET_CZ_OPEN_UI *p = RP2PTR(fd);
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
 
+	const struct PACKET_CZ_OPEN_UI *p = RP2PTR(fd);
 
 	clif->open_ui(sd, p->UIType);
 }
@@ -22180,6 +22638,8 @@ static void clif_parse_attendance_reward_request(int fd, struct map_session_data
 static void clif_parse_attendance_reward_request(int fd, struct map_session_data *sd)
 {
 #if PACKETVER_RE_NUM >= 20180307 || PACKETVER_MAIN_NUM >= 20180404 || PACKETVER_ZERO_NUM >= 20180411
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
 
 	struct rodex_message msg = { 0 };
 	struct attendance_entry *entry;
@@ -22261,6 +22721,9 @@ static void clif_parse_private_airship_request(int fd, struct map_session_data *
 static void clif_parse_private_airship_request(int fd, struct map_session_data *sd)
 {
 #if PACKETVER_RE_NUM >= 20180321 || PACKETVER_MAIN_NUM >= 20180620 || defined(PACKETVER_ZERO)
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	char evname[EVENT_NAME_LENGTH];
 	struct event_data *ev = NULL;
 	const struct PACKET_CZ_PRIVATE_AIRSHIP_REQUEST *p = RP2PTR(fd);
@@ -22302,6 +22765,9 @@ static void clif_private_airship_response(struct map_session_data *sd, uint32 fl
 static void clif_parse_cz_req_style_change(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_cz_req_style_change(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_STYLE_CHANGE *p = RP2PTR(fd);
 
 	if (p->HeadStyle > 0)
@@ -22323,6 +22789,9 @@ static void clif_parse_cz_req_style_change(int fd, struct map_session_data *sd)
 static void clif_parse_cz_req_style_change2(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_cz_req_style_change2(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_REQ_STYLE_CHANGE2 *p = RP2PTR(fd);
 
 	if (p->HeadStyle > 0)
@@ -22385,6 +22854,9 @@ static void clif_parse_changeDress(int fd, struct map_session_data *sd) __attrib
 /// 0ae8 <packet len>.W
 static void clif_parse_changeDress(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const char commandname[] = "changedress";
 	char command[sizeof commandname + 3] = ""; // '@' command + ' ' + NUL
 
@@ -22409,6 +22881,9 @@ static void clif_party_dead_notification(struct map_session_data *sd)
 static void clif_parse_memorial_dungeon_command(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 static void clif_parse_memorial_dungeon_command(int fd, struct map_session_data *sd)
 {
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_MEMORIALDUNGEON_COMMAND *p = RP2PTR(fd);
 
 	switch (p->command) {
@@ -22449,6 +22924,9 @@ static void clif_parse_cameraInfo(int fd, struct map_session_data *sd) __attribu
 static void clif_parse_cameraInfo(int fd, struct map_session_data *sd)
 {
 #if PACKETVER >= 20160525
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_CAMERA_INFO *const p = RFIFOP(fd, 0);
 	char command[100];
 	if (p->action == 1) {
@@ -22537,6 +23015,9 @@ static void clif_parse_NPCBarterPurchase(int fd, struct map_session_data *sd) __
 static void clif_parse_NPCBarterPurchase(int fd, struct map_session_data *sd)
 {
 #if PACKETVER_MAIN_NUM >= 20190116 || PACKETVER_RE_NUM >= 20190116 || PACKETVER_ZERO_NUM >= 20181226
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	const struct PACKET_CZ_NPC_BARTER_PURCHASE *p = RP2PTR(fd);
 	int count = (p->packetLength - sizeof(struct PACKET_CZ_NPC_BARTER_PURCHASE)) / sizeof p->list[0];
 	struct barteritemlist item_list;
@@ -22640,6 +23121,9 @@ static void clif_parse_AddItemRefineryUI(int fd, struct map_session_data *sd) __
 static void clif_parse_AddItemRefineryUI(int fd, struct map_session_data *sd)
 {
 #if PACKETVER_MAIN_NUM >= 20161005 || PACKETVER_RE_NUM >= 20161005 || defined(PACKETVER_ZERO)
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	if (battle_config.enable_refinery_ui == 0)
 		return;
 
@@ -22681,6 +23165,9 @@ static void clif_parse_RefineryUIRefine(int fd, struct map_session_data *sd) __a
 static void clif_parse_RefineryUIRefine(int fd, struct map_session_data *sd)
 {
 #if PACKETVER_MAIN_NUM >= 20161005 || PACKETVER_RE_NUM >= 20161005 || defined(PACKETVER_ZERO)
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	if (battle_config.enable_refinery_ui == 0)
 		return;
 
@@ -22693,6 +23180,9 @@ static void clif_parse_RefineryUIClose(int fd, struct map_session_data *sd) __at
 static void clif_parse_RefineryUIClose(int fd, struct map_session_data *sd)
 {
 #if PACKETVER_MAIN_NUM >= 20161130 || PACKETVER_RE_NUM >= 20161109 || defined(PACKETVER_ZERO)
+	if (sd->state.trading || pc_isdead(sd) || pc_isvending(sd))
+		return;
+
 	if (battle_config.enable_refinery_ui == 0)
 		return;
 
@@ -23378,6 +23868,7 @@ void clif_defaults(void)
 	clif->skillinfo = clif_skillinfo;
 	clif->addskill = clif_addskill;
 	clif->deleteskill = clif_deleteskill;
+	clif->playerSkillToPacket = clif_playerSkillToPacket;
 	/* party-specific */
 	clif->party_created = clif_party_created;
 	clif->party_member_info = clif_party_member_info;
diff --git a/src/map/clif.h b/src/map/clif.h
index ca7ae35b0..07d2ef4a8 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -57,6 +57,7 @@ struct view_data;
 struct achievement_data; // map/achievement.h
 struct s_refine_requirement;
 struct PACKET_ZC_ACK_RANKING_sub;
+struct SKILLDATA;
 
 enum clif_messages;
 enum rodex_add_item;
@@ -698,6 +699,26 @@ enum expand_inventory_result {
 	EXPAND_INVENTORY_RESULT_MAX_SIZE = 4
 };
 
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814
+enum market_buy_result {
+	MARKET_BUY_RESULT_ERROR = 0xffff,  // -1
+	MARKET_BUY_RESULT_SUCCESS = 0,
+	MARKET_BUY_RESULT_NO_ZENY = 1,
+	MARKET_BUY_RESULT_OVER_WEIGHT = 2,
+	MARKET_BUY_RESULT_OUT_OF_SPACE = 3,
+	MARKET_BUY_RESULT_AMOUNT_TOO_BIG = 9
+};
+#else
+enum market_buy_result {
+	MARKET_BUY_RESULT_ERROR = 0,
+	MARKET_BUY_RESULT_SUCCESS = 1,
+	MARKET_BUY_RESULT_NO_ZENY = 0,
+	MARKET_BUY_RESULT_OVER_WEIGHT = 0,
+	MARKET_BUY_RESULT_OUT_OF_SPACE = 0,
+	MARKET_BUY_RESULT_AMOUNT_TOO_BIG = 0
+};
+#endif
+
 /**
  * Clif.c Interface
  **/
@@ -1068,6 +1089,7 @@ struct clif_interface {
 	void (*skillinfo) (struct map_session_data *sd,int skill_id, int inf);
 	void (*addskill) (struct map_session_data *sd, int id);
 	void (*deleteskill) (struct map_session_data *sd, int id);
+	void (*playerSkillToPacket) (struct map_session_data *sd, struct SKILLDATA *skillData, int skillId, int idx, bool newSkill);
 	/* party-specific */
 	void (*party_created) (struct map_session_data *sd,int result);
 	void (*party_member_info) (struct party_data *p, struct map_session_data *sd);
@@ -1264,7 +1286,7 @@ struct clif_interface {
 	int (*delay_damage_sub) (int tid, int64 tick, int id, intptr_t data);
 	/* NPC Market */
 	void (*npc_market_open) (struct map_session_data *sd, struct npc_data *nd);
-	void (*npc_market_purchase_ack) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char response);
+	void (*npc_market_purchase_ack) (struct map_session_data *sd, const struct itemlist *item_list, enum market_buy_result response);
 	/* */
 	bool (*parse_roulette_db) (void);
 	void (*roulette_generate_ack) (struct map_session_data *sd, enum GENERATE_ROULETTE_ACK result, short stage, short prizeIdx, int bonusItemID);
diff --git a/src/map/messages_main.h b/src/map/messages_main.h
index 4f75d5071..bc5bcf55d 100644
--- a/src/map/messages_main.h
+++ b/src/map/messages_main.h
@@ -24,7 +24,7 @@
 
 /* This file is autogenerated, please do not commit manual changes
 
-Latest version: 20190724
+Latest version: 20190821
 */
 
 enum clif_messages {
@@ -21783,6 +21783,98 @@ AP가 부족합니다.
 */
 	MSG_ID_E3B = 0xe3b,
 #endif
+#if PACKETVER >= 20190731
+/*20190731 to latest
+제련도가 높아서 조합할 수 없습니다.
+*/
+	MSG_ID_E3C = 0xe3c,
+/*20190731 to latest
+제련도가 조합에 필요한 요구치보다 높습니다.
+*/
+	MSG_ID_E3D = 0xe3d,
+/*20190731 to latest
+'카드가 끼워져있거나 인챈트 되어 있습니다.
+*/
+	MSG_ID_E3E = 0xe3e,
+/*20190731 to latest
+∞
+*/
+	MSG_ID_E3F = 0xe3f,
+/*20190731 to latest
+Z
+*/
+	MSG_ID_E40 = 0xe40,
+/*20190731 to latest
+Total : %s Zeny
+*/
+	MSG_ID_E41 = 0xe41,
+#endif
+#if PACKETVER >= 20190821
+/*20190821 to latest
+계정한정판매 등록창
+*/
+	MSG_ID_E42 = 0xe42,
+/*20190821 to latest
+아이템 DB명
+Item DB Name
+*/
+	MSG_ID_E43 = 0xe43,
+/*20190821 to latest
+아이템 DB번호
+Item DB Number
+*/
+	MSG_ID_E44 = 0xe44,
+/*20190821 to latest
+판매 갯수
+Number of Sale
+*/
+	MSG_ID_E45 = 0xe45,
+/*20190821 to latest
+판매 시작시간
+Sale Start Time
+*/
+	MSG_ID_E46 = 0xe46,
+/*20190821 to latest
+판매 종료시간
+*/
+	MSG_ID_E47 = 0xe47,
+/*20190821 to latest
+계정 한정
+*/
+	MSG_ID_E48 = 0xe48,
+/*20190821 to latest
+판매기간 : %d월 %d일 %d시 %d분
+*/
+	MSG_ID_E49 = 0xe49,
+/*20190821 to latest
+구입가능 %d개
+*/
+	MSG_ID_E4A = 0xe4a,
+/*20190821 to latest
+%d개 한정
+*/
+	MSG_ID_E4B = 0xe4b,
+/*20190821 to latest
+>> ItemName : %s /  수량 : %d / 판매기간 : %d월:%d일:%d시:%d분 ~ %d월:%d일:%d시:%d분
+*/
+	MSG_ID_E4C = 0xe4c,
+/*20190821 to latest
+Sold Out
+*/
+	MSG_ID_E4D = 0xe4d,
+/*20190821 to latest
+[%s]은(는) 현재 소환할 수 없는 지역에 있습니다.
+*/
+	MSG_ID_E4E = 0xe4e,
+/*20190821 to latest
+~ %d월 %d일 %d시 %d분
+*/
+	MSG_ID_E4F = 0xe4f,
+/*20190821 to latest
+상품을 더이상 추가할 수 없습니다
+*/
+	MSG_ID_E50 = 0xe50,
+#endif
 
 };
 #endif /* MAP_MESSAGES_MAIN_H */
diff --git a/src/map/messages_re.h b/src/map/messages_re.h
index 6a20844e4..efebecdb2 100644
--- a/src/map/messages_re.h
+++ b/src/map/messages_re.h
@@ -24,7 +24,7 @@
 
 /* This file is autogenerated, please do not commit manual changes
 
-Latest version: 20190717
+Latest version: 20190821
 */
 
 enum clif_messages {
@@ -21262,6 +21262,98 @@ AP가 부족합니다.
 */
 	MSG_ID_E3B = 0xe3b,
 #endif
+#if PACKETVER >= 20190731
+/*20190731 to latest
+제련도가 높아서 조합할 수 없습니다.
+*/
+	MSG_ID_E3C = 0xe3c,
+/*20190731 to latest
+제련도가 조합에 필요한 요구치보다 높습니다.
+*/
+	MSG_ID_E3D = 0xe3d,
+/*20190731 to latest
+'카드가 끼워져있거나 인챈트 되어 있습니다.
+*/
+	MSG_ID_E3E = 0xe3e,
+/*20190731 to latest
+∞
+*/
+	MSG_ID_E3F = 0xe3f,
+/*20190731 to latest
+Z
+*/
+	MSG_ID_E40 = 0xe40,
+/*20190731 to latest
+Total : %s Zeny
+*/
+	MSG_ID_E41 = 0xe41,
+#endif
+#if PACKETVER >= 20190821
+/*20190821 to latest
+계정한정판매 등록창
+*/
+	MSG_ID_E42 = 0xe42,
+/*20190821 to latest
+아이템 DB명
+Item DB Name
+*/
+	MSG_ID_E43 = 0xe43,
+/*20190821 to latest
+아이템 DB번호
+Item DB Number
+*/
+	MSG_ID_E44 = 0xe44,
+/*20190821 to latest
+판매 갯수
+Number of Sale
+*/
+	MSG_ID_E45 = 0xe45,
+/*20190821 to latest
+판매 시작시간
+Sale Start Time
+*/
+	MSG_ID_E46 = 0xe46,
+/*20190821 to latest
+판매 종료시간
+*/
+	MSG_ID_E47 = 0xe47,
+/*20190821 to latest
+계정 한정
+*/
+	MSG_ID_E48 = 0xe48,
+/*20190821 to latest
+판매기간 : %d월 %d일 %d시 %d분
+*/
+	MSG_ID_E49 = 0xe49,
+/*20190821 to latest
+구입가능 %d개
+*/
+	MSG_ID_E4A = 0xe4a,
+/*20190821 to latest
+%d개 한정
+*/
+	MSG_ID_E4B = 0xe4b,
+/*20190821 to latest
+>> ItemName : %s /  수량 : %d / 판매기간 : %d월:%d일:%d시:%d분 ~ %d월:%d일:%d시:%d분
+*/
+	MSG_ID_E4C = 0xe4c,
+/*20190821 to latest
+Sold Out
+*/
+	MSG_ID_E4D = 0xe4d,
+/*20190821 to latest
+[%s]은(는) 현재 소환할 수 없는 지역에 있습니다.
+*/
+	MSG_ID_E4E = 0xe4e,
+/*20190821 to latest
+~ %d월 %d일 %d시 %d분
+*/
+	MSG_ID_E4F = 0xe4f,
+/*20190821 to latest
+상품을 더이상 추가할 수 없습니다
+*/
+	MSG_ID_E50 = 0xe50,
+#endif
 
 };
 #endif /* MAP_MESSAGES_RE_H */
diff --git a/src/map/messages_zero.h b/src/map/messages_zero.h
index b9ddb229c..344dbb29e 100644
--- a/src/map/messages_zero.h
+++ b/src/map/messages_zero.h
@@ -24,7 +24,7 @@
 
 /* This file is autogenerated, please do not commit manual changes
 
-Latest version: 20190724
+Latest version: 20190814
 */
 
 enum clif_messages {
@@ -17877,6 +17877,76 @@ AP가 부족합니다.
 */
 	MSG_ID_E3E = 0xe3e,
 #endif
+#if PACKETVER >= 20190814
+/*20190814 to latest
+∞
+*/
+	MSG_ID_E3F = 0xe3f,
+/*20190814 to latest
+Z
+*/
+	MSG_ID_E40 = 0xe40,
+/*20190814 to latest
+Total : %s Zeny
+*/
+	MSG_ID_E41 = 0xe41,
+/*20190814 to latest
+계정한정판매 등록창
+*/
+	MSG_ID_E42 = 0xe42,
+/*20190814 to latest
+아이템 DB명
+Item DB Name
+*/
+	MSG_ID_E43 = 0xe43,
+/*20190814 to latest
+아이템 DB번호
+Item DB Number
+*/
+	MSG_ID_E44 = 0xe44,
+/*20190814 to latest
+판매 갯수
+Number of Sale
+*/
+	MSG_ID_E45 = 0xe45,
+/*20190814 to latest
+판매 시작시간
+Sale Start Time
+*/
+	MSG_ID_E46 = 0xe46,
+/*20190814 to latest
+판매 종료시간
+*/
+	MSG_ID_E47 = 0xe47,
+/*20190814 to latest
+계정 한정
+*/
+	MSG_ID_E48 = 0xe48,
+/*20190814 to latest
+판매기간 : %d월 %d일 ~ %d월 %d일
+*/
+	MSG_ID_E49 = 0xe49,
+/*20190814 to latest
+구입가능 %d개
+*/
+	MSG_ID_E4A = 0xe4a,
+/*20190814 to latest
+%d개 한정
+*/
+	MSG_ID_E4B = 0xe4b,
+/*20190814 to latest
+>> ItemName : %s /  수량 : %d / 판매기간 : %d월:%d일:%d시:%d분 ~ %d월:%d일:%d시:%d분
+*/
+	MSG_ID_E4C = 0xe4c,
+/*20190814 to latest
+Sold Out
+*/
+	MSG_ID_E4D = 0xe4d,
+/*20190814 to latest
+[%s]은(는) 현재 소환할 수 없는 지역에 있습니다.
+*/
+	MSG_ID_E4E = 0xe4e,
+#endif
 
 };
 #endif /* MAP_MESSAGES_ZERO_H */
diff --git a/src/map/npc.c b/src/map/npc.c
index fea82c873..c3dff5870 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2115,7 +2115,7 @@ static int npc_buylist(struct map_session_data *sd, struct itemlist *item_list)
 /**
  * Processes incoming npc market purchase list
  **/
-static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item_list)
+static enum market_buy_result npc_market_buylist(struct map_session_data *sd, struct itemlist *item_list)
 {
 	struct npc_data* nd;
 	struct npc_item_list *shop = NULL;
@@ -2129,7 +2129,7 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
 	nd = npc->checknear(sd,map->id2bl(sd->npc_shopid));
 
 	if (nd == NULL || nd->subtype != SCRIPT || VECTOR_LENGTH(*item_list) == 0 || !nd->u.scr.shop || nd->u.scr.shop->type != NST_MARKET)
-		return 1;
+		return MARKET_BUY_RESULT_ERROR;
 
 	shop = nd->u.scr.shop->item;
 	shop_size = nd->u.scr.shop->items;
@@ -2149,18 +2149,18 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
 				 entry->id == itemdb_viewid(shop[j].nameid) //item_avail replacement
 				 );
 		if (j == shop_size) /* TODO find official response for this */
-			return 1; // no such item in shop
+			return MARKET_BUY_RESULT_ERROR; // no such item in shop
 
 		entry->id = shop[j].nameid; //item_avail replacement
 
 		if (entry->amount > (int)shop[j].qty)
-			return 1;
+			return MARKET_BUY_RESULT_AMOUNT_TOO_BIG;
 
 		value = shop[j].value;
 		npc_market_qty[i] = j;
 
 		if (!itemdb->exists(entry->id)) /* TODO find official response for this */
-			return 1; // item no longer in itemdb
+			return MARKET_BUY_RESULT_ERROR; // item no longer in itemdb
 
 		if (!itemdb->isstackable(entry->id) && entry->amount > 1) {
 			//Exploit? You can't buy more than 1 of equipment types o.O
@@ -2184,13 +2184,13 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
 	}
 
 	if (z > sd->status.zeny) /* TODO find official response for this */
-		return 1; // Not enough Zeny
+		return MARKET_BUY_RESULT_NO_ZENY; // Not enough Zeny
 
 	if( w + sd->weight > sd->max_weight ) /* TODO find official response for this */
-		return 1; // Too heavy
+		return MARKET_BUY_RESULT_OVER_WEIGHT; // Too heavy
 
 	if( pc->inventoryblank(sd) < new_ ) /* TODO find official response for this */
-		return 1; // Not enough space to store items
+		return MARKET_BUY_RESULT_OUT_OF_SPACE; // Not enough space to store items
 
 	pc->payzeny(sd,(int)z,LOG_TYPE_NPC, NULL);
 
@@ -2200,7 +2200,7 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
 		j = npc_market_qty[i];
 
 		if (entry->amount > (int)shop[j].qty) /* wohoo someone tampered with the packet. */
-			return 1;
+			return MARKET_BUY_RESULT_AMOUNT_TOO_BIG;
 
 		shop[j].qty -= entry->amount;
 
@@ -2218,7 +2218,7 @@ static int npc_market_buylist(struct map_session_data *sd, struct itemlist *item
 		}
 	}
 
-	return 0;
+	return MARKET_BUY_RESULT_SUCCESS;
 }
 
 /**
diff --git a/src/map/npc.h b/src/map/npc.h
index 2819cbd87..507635a84 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -34,6 +34,8 @@ struct hplugin_data_store;
 struct itemlist; // map/itemdb.h
 struct view_data;
 
+enum market_buy_result;
+
 enum npc_parse_options {
 	NPO_NONE  = 0x0,
 	NPO_ONINIT  = 0x1,
@@ -310,7 +312,7 @@ struct npc_interface {
 	void (*trader_count_funds) (struct npc_data *nd, struct map_session_data *sd);
 	bool (*trader_pay) (struct npc_data *nd, struct map_session_data *sd, int price, int points);
 	void (*trader_update) (int master);
-	int (*market_buylist) (struct map_session_data *sd, struct itemlist *item_list);
+	enum market_buy_result (*market_buylist) (struct map_session_data *sd, struct itemlist *item_list);
 	int (*barter_buylist) (struct map_session_data *sd, struct barteritemlist *item_list);
 	bool (*trader_open) (struct map_session_data *sd, struct npc_data *nd);
 	void (*market_fromsql) (void);
diff --git a/src/map/packets_keys_main.h b/src/map/packets_keys_main.h
index 601c7dc86..565835cd7 100644
--- a/src/map/packets_keys_main.h
+++ b/src/map/packets_keys_main.h
@@ -37,7 +37,7 @@
 	packetKeys(0x49357d72,0x22c370a1,0x5f836591);
 #endif
 
-// 2010-11-23aRagexeRE, 2010-11-24aRagexeRE, 2010-11-24bRagexeRE, 2010-11-25aRagexeRE, 2010-11-26aRagexeRE, 2010-11-30aRagexeRE, 2010-12-07aRagexeRE, 2010-12-14aRagexeRE, 2010-12-21aRagexeRE, 2010-12-23aRagexeRE, 2010-12-28aRagexeRE, 2011-01-04aRagexeRE, 2011-01-05aRagexeRE, 2011-01-11aRagexeRE, 2011-01-18aRagexeRE, 2011-01-25aRagexeRE, 2011-01-26aRagexeRE, 2011-01-26bRagexeRE, 2011-01-31aRagexeRE, 2011-01-31bRagexeRE, 2011-01-31cRagexeRE, 2011-02-08aRagexeRE, 2011-02-15aRagexeRE, 2011-02-22aRagexeRE, 2011-02-23aRagexeRE, 2011-02-23bRagexeRE, 2011-02-24aRagexeRE, 2011-02-25aRagexeRE, 2011-02-28aRagexeRE, 2011-03-08aRagexeRE, 2011-03-09aRagexeRE, 2011-03-09bRagexeRE, 2011-03-09cRagexeRE, 2011-03-09dRagexeRE, 2011-03-15aRagexeRE, 2011-03-22aRagexeRE, 2011-03-29aRagexeRE, 2011-03-30aRagexeRE, 2011-03-30cRagexeRE, 2011-04-05aRagexeRE, 2011-04-12aRagexeRE, 2011-04-19aRagexeRE, 2011-04-20aRagexeRE, 2011-04-26aRagexeRE, 2011-04-27aRagexeRE, 2011-05-03aRagexeRE, 2011-05-11aRagexeRE, 2011-05-17bRagexeRE, 2011-05-24aRagexeRE, 2011-05-26aRagexeRE, 2011-05-31aRagexeRE, 2011-06-07aRagexeRE, 2011-06-08aRagexeRE, 2011-06-08bRagexeRE, 2011-06-08cRagexeRE, 2011-06-09aRagexeRE, 2011-06-14bRagexeRE, 2011-06-22aRagexeRE, 2011-06-28aRagexeRE, 2011-07-06aRagexeRE, 2011-07-13aRagexeRE, 2011-07-13bRagexeRE, 2011-07-13cRagexeRE, 2011-07-19aRagexeRE, 2011-07-26aRagexeRE, 2011-08-03aRagexeRE, 2011-08-03bRagexeRE, 2011-08-10aRagexeRE, 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-16cRagexeRE, 2018-05-23aRagexe, 2018-05-23aRagexeRE, 2018-05-30aRagexe, 2018-05-30bRagexeRE, 2018-05-30cRagexeRE, 2018-06-05bRagexe, 2018-06-05bRagexeRE, 2018-06-12aRagexeRE, 2018-06-12bRagexeRE, 2018-06-20cRagexe, 2018-06-20dRagexeRE, 2018-06-20eRagexe, 2018-06-20eRagexeRE, 2018-06-21aRagexe, 2018-06-21aRagexeRE, 2018-07-04aRagexe, 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexe, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexe, 2018-07-18cRagexeRE, 2018-08-01cRagexe, 2018-08-01cRagexeRE, 2018-08-08bRagexe, 2018-08-08bRagexeRE, 2018-08-22cRagexe, 2018-08-22cRagexeRE, 2018-08-29aRagexe, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-08-31aRagexe, 2018-09-12dRagexe, 2018-09-12dRagexeRE, 2018-09-19aRagexe, 2018-09-19aRagexeRE, 2018-10-02aRagexe, 2018-10-02aRagexeRE, 2018-10-02bRagexe, 2018-10-02bRagexeRE, 2018-10-17_02aRagexe, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexe, 2018-10-17_03aRagexeRE, 2018-10-17bRagexe, 2018-10-17bRagexeRE, 2018-10-24bRagexe, 2018-10-31aRagexe, 2018-10-31bRagexe, 2018-10-31cRagexeRE, 2018-11-07aRagexe, 2018-11-07aRagexeRE, 2018-11-14cRagexe, 2018-11-14cRagexeRE, 2018-11-14dRagexe, 2018-11-14dRagexeRE, 2018-11-21bRagexe, 2018-11-21cRagexeRE, 2018-11-28aRagexe, 2018-11-28aRagexeRE, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-05bRagexeRE, 2018-12-12aRagexe, 2018-12-12aRagexeRE, 2018-12-12bRagexe, 2018-12-12bRagexeRE, 2018-12-19bRagexe, 2018-12-19bRagexeRE, 2018-12-26aRagexe, 2018-12-26aRagexeRE, 2019-01-09aRagexe, 2019-01-09bRagexeRE, 2019-01-16bRagexe, 2019-01-16bRagexeRE, 2019-01-16cRagexe, 2019-01-16cRagexeRE, 2019-01-23dRagexe, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-20aRagexeRE, 2019-02-27aRagexe, 2019-02-27bRagexeRE, 2019-02-28aRagexe, 2019-02-28aRagexeRE, 2019-03-06bRagexe, 2019-03-06bRagexeRE, 2019-03-06cRagexe, 2019-03-06cRagexeRE, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-20aRagexeRE, 2019-03-22aRagexe, 2019-03-22aRagexeRE, 2019-03-27bRagexe, 2019-03-27bRagexeRE, 2019-04-03aRagexe, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17aRagexe, 2019-04-17cRagexeRE, 2019-04-18aRagexe, 2019-04-18aRagexeRE, 2019-05-08cRagexe, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexe, 2019-05-22bRagexeRE, 2019-05-22cRagexe, 2019-05-22cRagexeRE, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29bRagexeRE, 2019-05-29cRagexe, 2019-05-29cRagexeRE, 2019-05-30aRagexe, 2019-05-30aRagexeRE, 2019-06-05JRagexeRE, 2019-06-05KRagexe, 2019-06-05LRagexeRE, 2019-06-05fRagexe, 2019-06-05hRagexeRE, 2019-06-19bRagexe, 2019-06-19cRagexeRE, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-06-26bRagexeRE, 2019-07-03aRagexe, 2019-07-03bRagexeRE, 2019-07-17aRagexe, 2019-07-17cRagexeRE, 2019-07-17dRagexe, 2019-07-17dRagexeRE, 2019-07-24aRagexe, 2019-07-24bRagexeRE
+// 2010-11-23aRagexeRE, 2010-11-24aRagexeRE, 2010-11-24bRagexeRE, 2010-11-25aRagexeRE, 2010-11-26aRagexeRE, 2010-11-30aRagexeRE, 2010-12-07aRagexeRE, 2010-12-14aRagexeRE, 2010-12-21aRagexeRE, 2010-12-23aRagexeRE, 2010-12-28aRagexeRE, 2011-01-04aRagexeRE, 2011-01-05aRagexeRE, 2011-01-11aRagexeRE, 2011-01-18aRagexeRE, 2011-01-25aRagexeRE, 2011-01-26aRagexeRE, 2011-01-26bRagexeRE, 2011-01-31aRagexeRE, 2011-01-31bRagexeRE, 2011-01-31cRagexeRE, 2011-02-08aRagexeRE, 2011-02-15aRagexeRE, 2011-02-22aRagexeRE, 2011-02-23aRagexeRE, 2011-02-23bRagexeRE, 2011-02-24aRagexeRE, 2011-02-25aRagexeRE, 2011-02-28aRagexeRE, 2011-03-08aRagexeRE, 2011-03-09aRagexeRE, 2011-03-09bRagexeRE, 2011-03-09cRagexeRE, 2011-03-09dRagexeRE, 2011-03-15aRagexeRE, 2011-03-22aRagexeRE, 2011-03-29aRagexeRE, 2011-03-30aRagexeRE, 2011-03-30cRagexeRE, 2011-04-05aRagexeRE, 2011-04-12aRagexeRE, 2011-04-19aRagexeRE, 2011-04-20aRagexeRE, 2011-04-26aRagexeRE, 2011-04-27aRagexeRE, 2011-05-03aRagexeRE, 2011-05-11aRagexeRE, 2011-05-17bRagexeRE, 2011-05-24aRagexeRE, 2011-05-26aRagexeRE, 2011-05-31aRagexeRE, 2011-06-07aRagexeRE, 2011-06-08aRagexeRE, 2011-06-08bRagexeRE, 2011-06-08cRagexeRE, 2011-06-09aRagexeRE, 2011-06-14bRagexeRE, 2011-06-22aRagexeRE, 2011-06-28aRagexeRE, 2011-07-06aRagexeRE, 2011-07-13aRagexeRE, 2011-07-13bRagexeRE, 2011-07-13cRagexeRE, 2011-07-19aRagexeRE, 2011-07-26aRagexeRE, 2011-08-03aRagexeRE, 2011-08-03bRagexeRE, 2011-08-10aRagexeRE, 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-16cRagexeRE, 2018-05-23aRagexe, 2018-05-23aRagexeRE, 2018-05-30aRagexe, 2018-05-30bRagexeRE, 2018-05-30cRagexeRE, 2018-06-05bRagexe, 2018-06-05bRagexeRE, 2018-06-12aRagexeRE, 2018-06-12bRagexeRE, 2018-06-20cRagexe, 2018-06-20dRagexeRE, 2018-06-20eRagexe, 2018-06-20eRagexeRE, 2018-06-21aRagexe, 2018-06-21aRagexeRE, 2018-07-04aRagexe, 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexe, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexe, 2018-07-18cRagexeRE, 2018-08-01cRagexe, 2018-08-01cRagexeRE, 2018-08-08bRagexe, 2018-08-08bRagexeRE, 2018-08-22cRagexe, 2018-08-22cRagexeRE, 2018-08-29aRagexe, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-08-31aRagexe, 2018-09-12dRagexe, 2018-09-12dRagexeRE, 2018-09-19aRagexe, 2018-09-19aRagexeRE, 2018-10-02aRagexe, 2018-10-02aRagexeRE, 2018-10-02bRagexe, 2018-10-02bRagexeRE, 2018-10-17_02aRagexe, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexe, 2018-10-17_03aRagexeRE, 2018-10-17bRagexe, 2018-10-17bRagexeRE, 2018-10-24bRagexe, 2018-10-31aRagexe, 2018-10-31bRagexe, 2018-10-31cRagexeRE, 2018-11-07aRagexe, 2018-11-07aRagexeRE, 2018-11-14cRagexe, 2018-11-14cRagexeRE, 2018-11-14dRagexe, 2018-11-14dRagexeRE, 2018-11-21bRagexe, 2018-11-21cRagexeRE, 2018-11-28aRagexe, 2018-11-28aRagexeRE, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-05bRagexeRE, 2018-12-12aRagexe, 2018-12-12aRagexeRE, 2018-12-12bRagexe, 2018-12-12bRagexeRE, 2018-12-19bRagexe, 2018-12-19bRagexeRE, 2018-12-26aRagexe, 2018-12-26aRagexeRE, 2019-01-09aRagexe, 2019-01-09bRagexeRE, 2019-01-16bRagexe, 2019-01-16bRagexeRE, 2019-01-16cRagexe, 2019-01-16cRagexeRE, 2019-01-23dRagexe, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-20aRagexeRE, 2019-02-27aRagexe, 2019-02-27bRagexeRE, 2019-02-28aRagexe, 2019-02-28aRagexeRE, 2019-03-06bRagexe, 2019-03-06bRagexeRE, 2019-03-06cRagexe, 2019-03-06cRagexeRE, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-20aRagexeRE, 2019-03-22aRagexe, 2019-03-22aRagexeRE, 2019-03-27bRagexe, 2019-03-27bRagexeRE, 2019-04-03aRagexe, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17aRagexe, 2019-04-17cRagexeRE, 2019-04-18aRagexe, 2019-04-18aRagexeRE, 2019-05-08cRagexe, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexe, 2019-05-22bRagexeRE, 2019-05-22cRagexe, 2019-05-22cRagexeRE, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29bRagexeRE, 2019-05-29cRagexe, 2019-05-29cRagexeRE, 2019-05-30aRagexe, 2019-05-30aRagexeRE, 2019-06-05JRagexeRE, 2019-06-05KRagexe, 2019-06-05LRagexeRE, 2019-06-05fRagexe, 2019-06-05hRagexeRE, 2019-06-19bRagexe, 2019-06-19cRagexeRE, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-06-26bRagexeRE, 2019-07-03aRagexe, 2019-07-03bRagexeRE, 2019-07-17aRagexe, 2019-07-17cRagexeRE, 2019-07-17dRagexe, 2019-07-17dRagexeRE, 2019-07-24aRagexe, 2019-07-24bRagexeRE, 2019-07-31bRagexe, 2019-07-31bRagexeRE, 2019-08-02aRagexe, 2019-08-02aRagexeRE, 2019-08-07aRagexe, 2019-08-07dRagexeRE, 2019-08-21aRagexe, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE
 #if PACKETVER == 20101123 || \
     PACKETVER == 20101124 || \
     PACKETVER == 20101125 || \
@@ -158,7 +158,11 @@
     PACKETVER == 20190626 || \
     PACKETVER == 20190703 || \
     PACKETVER == 20190717 || \
-    PACKETVER >= 20190724
+    PACKETVER == 20190724 || \
+    PACKETVER == 20190731 || \
+    PACKETVER == 20190802 || \
+    PACKETVER == 20190807 || \
+    PACKETVER >= 20190821
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
diff --git a/src/map/packets_keys_zero.h b/src/map/packets_keys_zero.h
index 8eea0214c..0e70ef641 100644
--- a/src/map/packets_keys_zero.h
+++ b/src/map/packets_keys_zero.h
@@ -30,7 +30,7 @@
 
 /* This file is autogenerated, please do not commit manual changes */
 
-// 2017-10-18aRagexe_zero, 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero, 2018-06-05bRagexe_zero, 2018-06-05cRagexe_zero, 2018-06-27aRagexe_zero, 2018-07-03aRagexe_zero, 2018-07-11_2aRagexe_zero, 2018-07-25_2aRagexe_zero, 2018-08-01aRagexe_zero, 2018-08-08_2aRagexe_zero, 2018-08-22aRagexe_zero, 2018-08-29aRagexe_zero, 2018-09-05aRagexe_zero, 2018-09-12aRagexe_zero, 2018-09-19aRagexe_zero, 2018-09-28aRagexe_zero, 2018-10-10_2aRagexe_zero, 2018-10-24_2aRagexe_zero, 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero
+// 2017-10-18aRagexe_zero, 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero, 2018-06-05bRagexe_zero, 2018-06-05cRagexe_zero, 2018-06-27aRagexe_zero, 2018-07-03aRagexe_zero, 2018-07-11_2aRagexe_zero, 2018-07-25_2aRagexe_zero, 2018-08-01aRagexe_zero, 2018-08-08_2aRagexe_zero, 2018-08-22aRagexe_zero, 2018-08-29aRagexe_zero, 2018-09-05aRagexe_zero, 2018-09-12aRagexe_zero, 2018-09-19aRagexe_zero, 2018-09-28aRagexe_zero, 2018-10-10_2aRagexe_zero, 2018-10-24_2aRagexe_zero, 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero, 2019-08-14_3aRagexe_zero
 #if PACKETVER == 20171018 || \
     PACKETVER == 20171019 || \
     PACKETVER == 20171023 || \
@@ -90,7 +90,8 @@
     PACKETVER == 20190709 || \
     PACKETVER == 20190710 || \
     PACKETVER == 20190717 || \
-    PACKETVER >= 20190724
+    PACKETVER == 20190724 || \
+    PACKETVER >= 20190814
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
diff --git a/src/map/packets_shuffle_main.h b/src/map/packets_shuffle_main.h
index 1fef4cd25..082c940c9 100644
--- a/src/map/packets_shuffle_main.h
+++ b/src/map/packets_shuffle_main.h
@@ -9727,7 +9727,7 @@
 	packet(0x0967,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
 #endif
 
-// 2018-11-21bRagexe, 2018-11-28aRagexe, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-12aRagexe, 2018-12-12bRagexe, 2018-12-19bRagexe, 2018-12-26aRagexe, 2019-01-09aRagexe, 2019-01-16bRagexe, 2019-01-16cRagexe, 2019-01-23dRagexe, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-27aRagexe, 2019-02-28aRagexe, 2019-03-06bRagexe, 2019-03-06cRagexe, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-22aRagexe, 2019-03-27bRagexe, 2019-04-03aRagexe, 2019-04-17aRagexe, 2019-04-18aRagexe, 2019-05-08cRagexe, 2019-05-22bRagexe, 2019-05-22cRagexe, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29cRagexe, 2019-05-30aRagexe, 2019-06-05fRagexe, 2019-06-05KRagexe, 2019-06-19bRagexe, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-07-03aRagexe, 2019-07-17aRagexe, 2019-07-17dRagexe, 2019-07-24aRagexe
+// 2018-11-21bRagexe, 2018-11-28aRagexe, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-12aRagexe, 2018-12-12bRagexe, 2018-12-19bRagexe, 2018-12-26aRagexe, 2019-01-09aRagexe, 2019-01-16bRagexe, 2019-01-16cRagexe, 2019-01-23dRagexe, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-27aRagexe, 2019-02-28aRagexe, 2019-03-06bRagexe, 2019-03-06cRagexe, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-22aRagexe, 2019-03-27bRagexe, 2019-04-03aRagexe, 2019-04-17aRagexe, 2019-04-18aRagexe, 2019-05-08cRagexe, 2019-05-22bRagexe, 2019-05-22cRagexe, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29cRagexe, 2019-05-30aRagexe, 2019-06-05fRagexe, 2019-06-05KRagexe, 2019-06-19bRagexe, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-07-03aRagexe, 2019-07-17aRagexe, 2019-07-17dRagexe, 2019-07-24aRagexe, 2019-07-31bRagexe, 2019-08-02aRagexe, 2019-08-07aRagexe, 2019-08-21aRagexe
 #if PACKETVER == 20181121 || \
     PACKETVER == 20181128 || \
     PACKETVER == 20181205 || \
@@ -9757,7 +9757,11 @@
     PACKETVER == 20190619 || \
     PACKETVER == 20190703 || \
     PACKETVER == 20190717 || \
-    PACKETVER >= 20190724
+    PACKETVER == 20190724 || \
+    PACKETVER == 20190731 || \
+    PACKETVER == 20190802 || \
+    PACKETVER == 20190807 || \
+    PACKETVER >= 20190821
 	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
 	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
 	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
diff --git a/src/map/packets_shuffle_re.h b/src/map/packets_shuffle_re.h
index ce789b837..044788301 100644
--- a/src/map/packets_shuffle_re.h
+++ b/src/map/packets_shuffle_re.h
@@ -9663,7 +9663,7 @@
 	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
 #endif
 
-// 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexeRE, 2018-08-01cRagexeRE, 2018-08-08bRagexeRE, 2018-08-22cRagexeRE, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-09-12dRagexeRE, 2018-09-19aRagexeRE, 2018-10-02aRagexeRE, 2018-10-02bRagexeRE, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexeRE, 2018-10-17bRagexeRE, 2018-10-31cRagexeRE, 2018-11-07aRagexeRE, 2018-11-14cRagexeRE, 2018-11-14dRagexeRE, 2018-11-21cRagexeRE, 2018-11-28aRagexeRE, 2018-12-05bRagexeRE, 2018-12-12aRagexeRE, 2018-12-12bRagexeRE, 2018-12-19bRagexeRE, 2018-12-26aRagexeRE, 2019-01-09bRagexeRE, 2019-01-16bRagexeRE, 2019-01-16cRagexeRE, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-20aRagexeRE, 2019-02-27bRagexeRE, 2019-02-28aRagexeRE, 2019-03-06bRagexeRE, 2019-03-06cRagexeRE, 2019-03-20aRagexeRE, 2019-03-22aRagexeRE, 2019-03-27bRagexeRE, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17cRagexeRE, 2019-04-18aRagexeRE, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexeRE, 2019-05-22cRagexeRE, 2019-05-29bRagexeRE, 2019-05-29cRagexeRE, 2019-05-30aRagexeRE, 2019-06-05hRagexeRE, 2019-06-05JRagexeRE, 2019-06-05LRagexeRE, 2019-06-19cRagexeRE, 2019-06-26bRagexeRE, 2019-07-03bRagexeRE, 2019-07-17cRagexeRE, 2019-07-17dRagexeRE, 2019-07-24bRagexeRE
+// 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexeRE, 2018-08-01cRagexeRE, 2018-08-08bRagexeRE, 2018-08-22cRagexeRE, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-09-12dRagexeRE, 2018-09-19aRagexeRE, 2018-10-02aRagexeRE, 2018-10-02bRagexeRE, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexeRE, 2018-10-17bRagexeRE, 2018-10-31cRagexeRE, 2018-11-07aRagexeRE, 2018-11-14cRagexeRE, 2018-11-14dRagexeRE, 2018-11-21cRagexeRE, 2018-11-28aRagexeRE, 2018-12-05bRagexeRE, 2018-12-12aRagexeRE, 2018-12-12bRagexeRE, 2018-12-19bRagexeRE, 2018-12-26aRagexeRE, 2019-01-09bRagexeRE, 2019-01-16bRagexeRE, 2019-01-16cRagexeRE, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-20aRagexeRE, 2019-02-27bRagexeRE, 2019-02-28aRagexeRE, 2019-03-06bRagexeRE, 2019-03-06cRagexeRE, 2019-03-20aRagexeRE, 2019-03-22aRagexeRE, 2019-03-27bRagexeRE, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17cRagexeRE, 2019-04-18aRagexeRE, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexeRE, 2019-05-22cRagexeRE, 2019-05-29bRagexeRE, 2019-05-29cRagexeRE, 2019-05-30aRagexeRE, 2019-06-05hRagexeRE, 2019-06-05JRagexeRE, 2019-06-05LRagexeRE, 2019-06-19cRagexeRE, 2019-06-26bRagexeRE, 2019-07-03bRagexeRE, 2019-07-17cRagexeRE, 2019-07-17dRagexeRE, 2019-07-24bRagexeRE, 2019-07-31bRagexeRE, 2019-08-02aRagexeRE, 2019-08-07dRagexeRE, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE
 #if PACKETVER == 20180704 || \
     PACKETVER == 20180711 || \
     PACKETVER == 20180718 || \
@@ -9707,7 +9707,11 @@
     PACKETVER == 20190626 || \
     PACKETVER == 20190703 || \
     PACKETVER == 20190717 || \
-    PACKETVER >= 20190724
+    PACKETVER == 20190724 || \
+    PACKETVER == 20190731 || \
+    PACKETVER == 20190802 || \
+    PACKETVER == 20190807 || \
+    PACKETVER >= 20190821
 	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
 	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
 	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
diff --git a/src/map/packets_shuffle_zero.h b/src/map/packets_shuffle_zero.h
index 6e42253fe..109dadaba 100644
--- a/src/map/packets_shuffle_zero.h
+++ b/src/map/packets_shuffle_zero.h
@@ -742,7 +742,7 @@
 	packet(0x0968,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
 #endif
 
-// 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero
+// 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero, 2019-08-14_3aRagexe_zero
 #if PACKETVER == 20181114 || \
     PACKETVER == 20181120 || \
     PACKETVER == 20181128 || \
@@ -770,7 +770,8 @@
     PACKETVER == 20190709 || \
     PACKETVER == 20190710 || \
     PACKETVER == 20190717 || \
-    PACKETVER >= 20190724
+    PACKETVER == 20190724 || \
+    PACKETVER >= 20190814
 	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
 	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
 	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 59f148c94..d12dc14d4 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -300,7 +300,6 @@ enum packet_headers {
 	notifybindonequip = 0x2d3,
 	monsterhpType = 0x977,
 	maptypeproperty2Type = 0x99b,
-	npcmarketresultackType = 0x9d7,
 #if PACKETVER >= 20131223  // version probably can be 20131030 [4144]
 	wisendType = 0x9df,
 #else
@@ -1362,22 +1361,6 @@ struct packet_npc_market_purchase {
 	} list[]; // Note: We assume this should be <= MAX_INVENTORY (since you can't hold more than MAX_INVENTORY items thus cant buy that many at once).
 } __attribute__((packed));
 
-struct packet_npc_market_result_ack {
-	int16 PacketType;
-	int16 PacketLength;
-	uint8 result;
-	struct {
-#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
-		uint32 ITID;
-#else
-		uint16 ITID;
-#endif
-		uint16 qty;
-		uint32 price;
-	// [4144] need remove MAX_INVENTORY from here
-	} list[MAX_INVENTORY];/* assuming MAX_INVENTORY is max since you can't hold more than MAX_INVENTORY items thus cant buy that many at once. */
-} __attribute__((packed));
-
 #if PACKETVER_MAIN_NUM >= 20131120 || PACKETVER_RE_NUM >= 20131106 || defined(PACKETVER_ZERO)
 /* inner struct figured by Ind after some annoying hour of debugging (data Thanks to Yommy) */
 struct PACKET_ZC_NPC_MARKET_OPEN_sub {
@@ -2726,13 +2709,10 @@ struct PACKET_ZC_MAKINGITEM_LIST_sub {
 struct PACKET_ZC_MAKINGITEM_LIST {
 	int16 packetType;
 	int16 packetLength;
-#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
-	uint32 makeItem;
-#else
 	uint16 makeItem;
-#endif
 	struct PACKET_ZC_MAKINGITEM_LIST_sub items[];
 } __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_MAKINGITEM_LIST, 0x025a);
 
 struct PACKET_ZC_PC_CASH_POINT_ITEMLIST_sub {
 	uint32 price;
@@ -3480,7 +3460,7 @@ struct PACKET_ZC_REFINE_STATUS {
 DEFINE_PACKET_HEADER(ZC_REFINE_STATUS, 0x0ada);
 #endif
 
-#if PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724
+#if PACKETVER_MAIN_NUM >= 20190731 || PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724
 struct PACKET_ZC_ACK_RANKING_sub {
 	char name[NAME_LENGTH];
 	uint32 points;
@@ -3533,6 +3513,103 @@ struct PACKET_ZC_HAT_EFFECT {
 DEFINE_PACKET_HEADER(ZC_HAT_EFFECT, 0x0a3b);
 #endif
 
+// [4144] this struct updated not in all packets in client
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814
+struct SKILLDATA {
+	uint16 id;
+	int inf;
+	uint16 level;
+	uint16 sp;
+	uint16 range2;
+	uint8 upFlag;
+	uint16 level2;
+} __attribute__((packed));
+#else
+struct SKILLDATA {
+	uint16 id;
+	int inf;
+	uint16 level;
+	uint16 sp;
+	uint16 range2;
+	char name[NAME_LENGTH];
+	uint8 upFlag;
+} __attribute__((packed));
+#endif
+
+struct PACKET_ZC_ADD_SKILL {
+	int16 packetType;
+	struct SKILLDATA skill;
+} __attribute__((packed));
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814
+DEFINE_PACKET_HEADER(ZC_ADD_SKILL, 0x0b31);
+#else
+DEFINE_PACKET_HEADER(ZC_ADD_SKILL, 0x0111);
+#endif
+
+struct PACKET_ZC_SKILLINFO_LIST {
+	int16 packetType;
+	int16 packetLength;
+	struct SKILLDATA skills[];
+} __attribute__((packed));
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814
+DEFINE_PACKET_HEADER(ZC_SKILLINFO_LIST, 0x0b32);
+#else
+DEFINE_PACKET_HEADER(ZC_SKILLINFO_LIST, 0x010f);
+#endif
+
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814
+struct PACKET_ZC_SKILLINFO_UPDATE2 {
+	int16 packetType;
+	uint16 id;
+	int inf;
+	uint16 level;
+	uint16 sp;
+	uint16 range2;
+	uint8 upFlag;
+	uint16 level2;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_SKILLINFO_UPDATE2, 0x0b33);
+#else
+struct PACKET_ZC_SKILLINFO_UPDATE2 {
+	int16 packetType;
+	uint16 id;
+	int inf;
+	uint16 level;
+	uint16 sp;
+	uint16 range2;
+	uint8 upFlag;
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_SKILLINFO_UPDATE2, 0x07e1);
+#endif
+
+struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT_sub {
+#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
+	uint32 ITID;
+#else
+	uint16 ITID;
+#endif
+	uint16 qty;
+	uint32 price;
+} __attribute__((packed));
+
+#if PACKETVER_MAIN_NUM >= 20190807 || PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814
+struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT {
+	int16 PacketType;
+	int16 PacketLength;
+	uint16 result;
+	struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT_sub list[];
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_NPC_MARKET_PURCHASE_RESULT, 0x0b4e);
+#elif PACKETVER_MAIN_NUM >= 20131120 || PACKETVER_RE_NUM >= 20130911 || defined(PACKETVER_ZERO)
+struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT {
+	int16 PacketType;
+	int16 PacketLength;
+	uint8 result;
+	struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT_sub list[];
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_NPC_MARKET_PURCHASE_RESULT, 0x09d7);
+#endif
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
diff --git a/src/map/pc.h b/src/map/pc.h
index 7c89f7f32..f1b9e5d1a 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -675,6 +675,7 @@ END_ZEROED_BLOCK;
 #define pc_iscloaking(sd)     ( !((sd)->sc.option&OPTION_CHASEWALK) && ((sd)->sc.option&OPTION_CLOAK) )
 #define pc_ischasewalk(sd)    ( (sd)->sc.option&OPTION_CHASEWALK )
 #define pc_ismuted(sc,type)   ( (sc)->data[SC_NOCHAT] && (sc)->data[SC_NOCHAT]->val1&(type) )
+#define pc_isvending(sd)      ((sd)->state.vending || (sd)->state.prevend || (sd)->state.buyingstore)
 
 #ifdef NEW_CARTS
 	#define pc_iscarton(sd)       ( (sd)->sc.data[SC_PUSH_CART] )
diff --git a/src/map/trade.c b/src/map/trade.c
index cef14ffe6..7096d12e4 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -50,6 +50,9 @@ static void trade_traderequest(struct map_session_data *sd, struct map_session_d
 {
 	nullpo_retv(sd);
 
+	if (sd == target_sd)
+		return;
+
 	if (map->list[sd->bl.m].flag.notrade) {
 		clif->message (sd->fd, msg_sd(sd,272)); // You can't trade in this map
 		return;
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 24958711e..e8c7705a0 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1712,6 +1712,8 @@ typedef void (*HPMHOOK_pre_clif_addskill) (struct map_session_data **sd, int *id
 typedef void (*HPMHOOK_post_clif_addskill) (struct map_session_data *sd, int id);
 typedef void (*HPMHOOK_pre_clif_deleteskill) (struct map_session_data **sd, int *id);
 typedef void (*HPMHOOK_post_clif_deleteskill) (struct map_session_data *sd, int id);
+typedef void (*HPMHOOK_pre_clif_playerSkillToPacket) (struct map_session_data **sd, struct SKILLDATA **skillData, int *skillId, int *idx, bool *newSkill);
+typedef void (*HPMHOOK_post_clif_playerSkillToPacket) (struct map_session_data *sd, struct SKILLDATA *skillData, int skillId, int idx, bool newSkill);
 typedef void (*HPMHOOK_pre_clif_party_created) (struct map_session_data **sd, int *result);
 typedef void (*HPMHOOK_post_clif_party_created) (struct map_session_data *sd, int result);
 typedef void (*HPMHOOK_pre_clif_party_member_info) (struct party_data **p, struct map_session_data **sd);
@@ -2050,8 +2052,8 @@ typedef int (*HPMHOOK_pre_clif_delay_damage_sub) (int *tid, int64 *tick, int *id
 typedef int (*HPMHOOK_post_clif_delay_damage_sub) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 typedef void (*HPMHOOK_pre_clif_npc_market_open) (struct map_session_data **sd, struct npc_data **nd);
 typedef void (*HPMHOOK_post_clif_npc_market_open) (struct map_session_data *sd, struct npc_data *nd);
-typedef void (*HPMHOOK_pre_clif_npc_market_purchase_ack) (struct map_session_data **sd, const struct itemlist **item_list, unsigned char *response);
-typedef void (*HPMHOOK_post_clif_npc_market_purchase_ack) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char response);
+typedef void (*HPMHOOK_pre_clif_npc_market_purchase_ack) (struct map_session_data **sd, const struct itemlist **item_list, enum market_buy_result *response);
+typedef void (*HPMHOOK_post_clif_npc_market_purchase_ack) (struct map_session_data *sd, const struct itemlist *item_list, enum market_buy_result response);
 typedef bool (*HPMHOOK_pre_clif_parse_roulette_db) (void);
 typedef bool (*HPMHOOK_post_clif_parse_roulette_db) (bool retVal___);
 typedef void (*HPMHOOK_pre_clif_roulette_generate_ack) (struct map_session_data **sd, enum GENERATE_ROULETTE_ACK *result, short *stage, short *prizeIdx, int *bonusItemID);
@@ -5782,8 +5784,8 @@ typedef bool (*HPMHOOK_pre_npc_trader_pay) (struct npc_data **nd, struct map_ses
 typedef bool (*HPMHOOK_post_npc_trader_pay) (bool retVal___, struct npc_data *nd, struct map_session_data *sd, int price, int points);
 typedef void (*HPMHOOK_pre_npc_trader_update) (int *master);
 typedef void (*HPMHOOK_post_npc_trader_update) (int master);
-typedef int (*HPMHOOK_pre_npc_market_buylist) (struct map_session_data **sd, struct itemlist **item_list);
-typedef int (*HPMHOOK_post_npc_market_buylist) (int retVal___, struct map_session_data *sd, struct itemlist *item_list);
+typedef enum market_buy_result (*HPMHOOK_pre_npc_market_buylist) (struct map_session_data **sd, struct itemlist **item_list);
+typedef enum market_buy_result (*HPMHOOK_post_npc_market_buylist) (enum market_buy_result retVal___, struct map_session_data *sd, struct itemlist *item_list);
 typedef int (*HPMHOOK_pre_npc_barter_buylist) (struct map_session_data **sd, struct barteritemlist **item_list);
 typedef int (*HPMHOOK_post_npc_barter_buylist) (int retVal___, struct map_session_data *sd, struct barteritemlist *item_list);
 typedef bool (*HPMHOOK_pre_npc_trader_open) (struct map_session_data **sd, struct npc_data **nd);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index ad49bacb4..c87729dee 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -1302,6 +1302,8 @@ struct {
 	struct HPMHookPoint *HP_clif_addskill_post;
 	struct HPMHookPoint *HP_clif_deleteskill_pre;
 	struct HPMHookPoint *HP_clif_deleteskill_post;
+	struct HPMHookPoint *HP_clif_playerSkillToPacket_pre;
+	struct HPMHookPoint *HP_clif_playerSkillToPacket_post;
 	struct HPMHookPoint *HP_clif_party_created_pre;
 	struct HPMHookPoint *HP_clif_party_created_post;
 	struct HPMHookPoint *HP_clif_party_member_info_pre;
@@ -8097,6 +8099,8 @@ struct {
 	int HP_clif_addskill_post;
 	int HP_clif_deleteskill_pre;
 	int HP_clif_deleteskill_post;
+	int HP_clif_playerSkillToPacket_pre;
+	int HP_clif_playerSkillToPacket_post;
 	int HP_clif_party_created_pre;
 	int HP_clif_party_created_post;
 	int HP_clif_party_member_info_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 474bcfb14..656cc7737 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -675,6 +675,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->skillinfo, HP_clif_skillinfo) },
 	{ HP_POP(clif->addskill, HP_clif_addskill) },
 	{ HP_POP(clif->deleteskill, HP_clif_deleteskill) },
+	{ HP_POP(clif->playerSkillToPacket, HP_clif_playerSkillToPacket) },
 	{ HP_POP(clif->party_created, HP_clif_party_created) },
 	{ HP_POP(clif->party_member_info, HP_clif_party_member_info) },
 	{ HP_POP(clif->party_info, HP_clif_party_info) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 8817c34cc..5820ab92f 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -16980,6 +16980,32 @@ void HP_clif_deleteskill(struct map_session_data *sd, int id) {
 	}
 	return;
 }
+void HP_clif_playerSkillToPacket(struct map_session_data *sd, struct SKILLDATA *skillData, int skillId, int idx, bool newSkill) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_playerSkillToPacket_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, struct SKILLDATA **skillData, int *skillId, int *idx, bool *newSkill);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_playerSkillToPacket_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_playerSkillToPacket_pre[hIndex].func;
+			preHookFunc(&sd, &skillData, &skillId, &idx, &newSkill);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.playerSkillToPacket(sd, skillData, skillId, idx, newSkill);
+	}
+	if (HPMHooks.count.HP_clif_playerSkillToPacket_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, struct SKILLDATA *skillData, int skillId, int idx, bool newSkill);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_playerSkillToPacket_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_playerSkillToPacket_post[hIndex].func;
+			postHookFunc(sd, skillData, skillId, idx, newSkill);
+		}
+	}
+	return;
+}
 void HP_clif_party_created(struct map_session_data *sd, int result) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_party_created_pre > 0) {
@@ -21386,10 +21412,10 @@ void HP_clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) {
 	}
 	return;
 }
-void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, const struct itemlist *item_list, unsigned char response) {
+void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, const struct itemlist *item_list, enum market_buy_result response) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_npc_market_purchase_ack_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, const struct itemlist **item_list, unsigned char *response);
+		void (*preHookFunc) (struct map_session_data **sd, const struct itemlist **item_list, enum market_buy_result *response);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_pre[hIndex].func;
@@ -21404,7 +21430,7 @@ void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, const struct i
 		HPMHooks.source.clif.npc_market_purchase_ack(sd, item_list, response);
 	}
 	if (HPMHooks.count.HP_clif_npc_market_purchase_ack_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char response);
+		void (*postHookFunc) (struct map_session_data *sd, const struct itemlist *item_list, enum market_buy_result response);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_post[hIndex].func;
 			postHookFunc(sd, item_list, response);
@@ -57721,11 +57747,12 @@ void HP_npc_trader_update(int master) {
 	}
 	return;
 }
-int HP_npc_market_buylist(struct map_session_data *sd, struct itemlist *item_list) {
+enum market_buy_result HP_npc_market_buylist(struct map_session_data *sd, struct itemlist *item_list) {
+/* Unknown return type 'enum market_buy_result'. Initializing to '0'. */
 	int hIndex = 0;
-	int retVal___ = 0;
+	enum market_buy_result retVal___ = 0;
 	if (HPMHooks.count.HP_npc_market_buylist_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd, struct itemlist **item_list);
+		enum market_buy_result (*preHookFunc) (struct map_session_data **sd, struct itemlist **item_list);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_buylist_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_npc_market_buylist_pre[hIndex].func;
@@ -57740,7 +57767,7 @@ int HP_npc_market_buylist(struct map_session_data *sd, struct itemlist *item_lis
 		retVal___ = HPMHooks.source.npc.market_buylist(sd, item_list);
 	}
 	if (HPMHooks.count.HP_npc_market_buylist_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct itemlist *item_list);
+		enum market_buy_result (*postHookFunc) (enum market_buy_result retVal___, struct map_session_data *sd, struct itemlist *item_list);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_buylist_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_npc_market_buylist_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sd, item_list);