summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-01-25 22:21:54 +0300
committerAndrei Karas <akaras@inbox.ru>2019-01-25 22:21:54 +0300
commit0042fdf7678e8a8ba386668f4149a27e71ef8a13 (patch)
tree420ffe7ae1f0c5b284347c33d821c9bff8bbcefe
parentf6010722cd8843bf4367ee652b38000327c99082 (diff)
downloadplus-0042fdf7678e8a8ba386668f4149a27e71ef8a13.tar.gz
plus-0042fdf7678e8a8ba386668f4149a27e71ef8a13.tar.bz2
plus-0042fdf7678e8a8ba386668f4149a27e71ef8a13.tar.xz
plus-0042fdf7678e8a8ba386668f4149a27e71ef8a13.zip
Update version checks for packet CMSG_PRIVATE_AIRSHIP_REQUEST
-rw-r--r--src/net/eathena/npchandler.cpp4
-rw-r--r--src/net/eathena/packetsout.inc7
2 files changed, 10 insertions, 1 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 7fd69601e..f44043a85 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -48,6 +48,7 @@
extern int packetVersion;
extern int packetVersionMain;
extern int packetVersionRe;
+extern bool packets_zero;
extern int itemIdLen;
namespace EAthena
@@ -374,7 +375,8 @@ void NpcHandler::requestAirship(const std::string &mapName,
const int itemId) const
{
if (packetVersionRe < 20180321 &&
- packetVersionMain < 20180620)
+ packetVersionMain < 20180620 &&
+ packets_zero == false)
{
return;
}
diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc
index aca3e0b8f..ca3b0b2d4 100644
--- a/src/net/eathena/packetsout.inc
+++ b/src/net/eathena/packetsout.inc
@@ -1384,6 +1384,11 @@ if (packetVersion >= 20170419)
packet(CMSG_MAIL2_REFRESH_MAIL_LIST, 0x0ac1, 26, clif->pRodexRefreshMaillist);
}
+if (packets_zero >= true)
+{
+ packet(CMSG_PRIVATE_AIRSHIP_REQUEST, 0x0a49, 20, clif->pPrivateAirshipRequest);
+}
+
// 20171214 zero
if (packetVersionZero >= 20171214)
{
@@ -1530,12 +1535,14 @@ if (packetVersionZero >= 20181114)
packet(CMSG_INVENTORY_EXPAND_CONFIRM, 0x0b16, 2, clif->pInventoryExpansionConfirm);
packet(CMSG_INVENTORY_EXPAND_REJECT, 0x0b19, 2, clif->pInventoryExpansionReject);
packet(CMSG_NPC_SELECT_ARROW, 0x01ae, 6, clif->pSelectArrow);
+ packet(CMSG_PRIVATE_AIRSHIP_REQUEST, 0x0a49, 22, clif->pPrivateAirshipRequest);
}
// 20181121 main
if (packetVersionMain >= 20181121)
{
packet(CMSG_NPC_SELECT_ARROW, 0x01ae, 6, clif->pSelectArrow);
+ packet(CMSG_PRIVATE_AIRSHIP_REQUEST, 0x0a49, 22, clif->pPrivateAirshipRequest);
}
// 20181226 zero