5 files changed, 15 insertions, 0 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index 2ac37ffed..94acc54f5 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -140,6 +140,8 @@ class AdminHandler notfinal
         virtual void loadPosition(const std::string &name) const = 0;
 
         virtual void randomWarp(const std::string &name) const = 0;
+
+        virtual void gotoNpc(const std::string &name) const = 0;
 };
 
 }  // namespace Net
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index b647f92b0..f1742315b 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -265,4 +265,9 @@ void AdminHandler::randomWarp(const std::string &name) const
     Gm::runCharCommand("jump", name);
 }
 
+void AdminHandler::gotoNpc(const std::string &name) const
+{
+    Gm::runCommand("tonpc", name);
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index c7f997590..0ddc8b348 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -114,6 +114,8 @@ class AdminHandler final : public Ea::AdminHandler
 
         void randomWarp(const std::string &name) const override final;
 
+        void gotoNpc(const std::string &name) const override final;
+
     protected:
         static std::string mStatsName;
 };
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 363cd2552..76bec8fc5 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -207,4 +207,8 @@ void AdminHandler::randomWarp(const std::string &name A_UNUSED) const
 {
 }
 
+void AdminHandler::gotoNpc(const std::string &name A_UNUSED) const
+{
+}
+
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 88bd007f8..bdb7e1037 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -126,6 +126,8 @@ class AdminHandler final : public Ea::AdminHandler
                           A_CONST;
 
         void randomWarp(const std::string &name) const override final A_CONST;
+
+        void gotoNpc(const std::string &name) const override final A_CONST;
 };
 
 }  // namespace TmwAthena