2 files changed, 31 insertions, 0 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 151e54474..00c8b9a5c 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -25,6 +25,7 @@
 #include "flooritem.h"
 #include "inventory.h"
 #include "item.h"
+#include "party.h"
 
 #include "actions/actiondef.h"
 
@@ -442,6 +443,35 @@ impHandler(navigate)
     return true;
 }
 
+impHandler(navigateTo)
+{
+    if (!localPlayer)
+        return false;
+
+    const std::string args = event.args;
+    if (args.empty())
+        return true;
+
+    Being *const being = actorManager->findBeingByName(args);
+    if (being)
+    {
+        localPlayer->navigateTo(being->getTileX(), being->getTileY());
+    }
+    else if (localPlayer->isInParty())
+    {
+        const Party *const party = localPlayer->getParty();
+        if (party)
+        {
+            const PartyMember *const m = party->getMember(args);
+            const PartyMember *const o = party->getMember(
+                localPlayer->getName());
+            if (m && o && m->getMap() == o->getMap())
+                localPlayer->navigateTo(m->getX(), m->getY());
+        }
+    }
+    return true;
+}
+
 impHandler(imitation)
 {
     if (!localPlayer)
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 34dcf0c44..a8143275b 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -49,6 +49,7 @@ namespace Actions
     decHandler(pseudoAway);
     decHandler(follow);
     decHandler(navigate);
+    decHandler(navigateTo);
     decHandler(imitation);
     decHandler(sendMail);
     decHandler(info);