6 files changed, 16 insertions, 0 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index e5496cdfc..18e7c0fad 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -47,6 +47,8 @@ class AdminHandler notfinal
 
         virtual void kickName(const std::string &name) const = 0;
 
+        virtual void kickAll() const = 0;
+
         virtual void ban(const int playerId) const = 0;
 
         virtual void banName(const std::string &name) const = 0;
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index aa4980fb9..10d573cf8 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -97,6 +97,11 @@ void AdminHandler::kick(const int playerId) const
     outMsg.writeInt32(playerId, "account id");
 }
 
+void AdminHandler::kickAll() const
+{
+    MessageOut outMsg(CMSG_ADMIN_KICK_ALL);
+}
+
 void AdminHandler::warp(const std::string &map, const int x, const int y) const
 {
     MessageOut outMsg(CMSG_PLAYER_MAPMOVE);
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index 99b59f135..7c8f3d650 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -47,6 +47,8 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
 
         void kick(const int playerId) const override final;
 
+        void kickAll() const override final;
+
         void warp(const std::string &map,
                   const int x, const int y) const override final;
 
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 17b54bbf7..d3e02338e 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -300,6 +300,7 @@
 #define CMSG_ADMIN_LOCAL_ANNOUNCE    0x019C
 #define CMSG_ADMIN_HIDE              0x019D
 #define CMSG_ADMIN_KICK              0x00CC
+#define CMSG_ADMIN_KICK_ALL          0x00ce
 #define CMSG_ADMIN_MUTE              0x0149
 #define CMSG_ADMIN_RESET_PLAYER      0x0197
 
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 7ca5e35e4..a227652be 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -99,6 +99,10 @@ void AdminHandler::kick(const int playerId) const
     outMsg.writeInt32(playerId, "account id");
 }
 
+void AdminHandler::kickAll() const
+{
+}
+
 void AdminHandler::warp(const std::string &map, const int x, const int y) const
 {
     Net::getChatHandler()->talk(strprintf(
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 111601a24..ac11e7c34 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -47,6 +47,8 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
 
         void kick(const int playerId) const override final;
 
+        void kickAll() const override final;
+
         void warp(const std::string &map,
                   const int x, const int y) const override final;