summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-07-14 02:27:43 +0300
committerAndrei Karas <akaras@inbox.ru>2018-07-14 02:27:43 +0300
commit74035d87b34a0d98992e42fece129739ae57611d (patch)
tree3ae643862cee5f2ff5b638dd70927fd9daebeaf0
parentb4a2f8675591e05afeca7c55e432778dab2ffd10 (diff)
downloadmv-74035d87b34a0d98992e42fece129739ae57611d.tar.gz
mv-74035d87b34a0d98992e42fece129739ae57611d.tar.bz2
mv-74035d87b34a0d98992e42fece129739ae57611d.tar.xz
mv-74035d87b34a0d98992e42fece129739ae57611d.zip
Update packet CMSG_PRIVATE_AIRSHIP_REQUEST 0x0a49.
-rw-r--r--src/net/eathena/npchandler.cpp6
-rw-r--r--src/net/eathena/packetsout.inc6
2 files changed, 11 insertions, 1 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 9a0054b6a..384b38d18 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -46,6 +46,7 @@
#include "debug.h"
extern int packetVersion;
+extern int packetVersionMain;
extern int packetVersionRe;
namespace EAthena
@@ -366,8 +367,11 @@ BeingId NpcHandler::getNpc(Net::MessageIn &msg,
void NpcHandler::requestAirship(const std::string &mapName,
const int itemId) const
{
- if (packetVersionRe < 20180321)
+ if (packetVersionRe < 20180321 &&
+ packetVersionMain < 20180620)
+ {
return;
+ }
createOutPacket(CMSG_PRIVATE_AIRSHIP_REQUEST);
outMsg.writeString(mapName, 16, "map name");
outMsg.writeInt16(CAST_S16(itemId), "item");
diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc
index f74a59ac8..6b3e3dd34 100644
--- a/src/net/eathena/packetsout.inc
+++ b/src/net/eathena/packetsout.inc
@@ -1385,6 +1385,12 @@ if (packetVersionRe >= 20180321)
packet(CMSG_PRIVATE_AIRSHIP_REQUEST, 0x0a49, 20, clif->pPrivateAirshipRequest);
}
+// main 20180620
+if (packetVersionMain >= 20180620)
+{
+ packet(CMSG_PRIVATE_AIRSHIP_REQUEST, 0x0a49, 20, clif->pPrivateAirshipRequest);
+}
+
// main 20180404
if (packetVersionMain >= 20180404)
{