1 files changed, 18 insertions, 0 deletions
diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp
index 857890bd7..0c3985f07 100644
--- a/src/net/eathena/mercenaryhandler.cpp
+++ b/src/net/eathena/mercenaryhandler.cpp
@@ -30,6 +30,8 @@
 
 #include "gui/windows/skilldialog.h"
 
+#include "net/serverfeatures.h"
+
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
@@ -217,6 +219,8 @@ void MercenaryHandler::attack(const int targetId, const bool keep) const
 
 void MercenaryHandler::talk(const std::string &restrict text) const
 {
+    if (!serverFeatures->haveMovePet())
+        return;
     if (text.empty())
         return;
     std::string msg = text;
@@ -232,8 +236,22 @@ void MercenaryHandler::talk(const std::string &restrict text) const
 
 void MercenaryHandler::emote(const uint8_t emoteId) const
 {
+    if (!serverFeatures->haveMovePet())
+        return;
     createOutPacket(CMSG_HOMMERC_EMOTE);
     outMsg.writeInt8(emoteId, "emote id");
 }
 
+void MercenaryHandler::setDirection(const unsigned char type) const
+{
+    if (!serverFeatures->haveMovePet())
+        return;
+    createOutPacket(CMSG_HOMMERC_DIRECTION);
+    outMsg.writeInt32(0, "pet id");
+    outMsg.writeInt8(0, "head direction");
+    outMsg.writeInt8(0, "unused");
+    outMsg.writeInt8(MessageOut::toServerDirection(type),
+        "pet direction");
+}
+
 }  // namespace EAthena