6 files changed, 24 insertions, 0 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index 18323c180..c9ac96c55 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -185,6 +185,8 @@ class AdminHandler notfinal
         virtual void guildRecall(const std::string &name) const = 0;
 
         virtual void changeDress() const = 0;
+
+        virtual void resetCooldowns() const = 0;
 };
 
 }  // namespace Net
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 4e62423d9..ccbc507af 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -389,4 +389,11 @@ void AdminHandler::changeDress() const
     createOutPacket(CMSG_CHANGE_DRESS);
 }
 
+void AdminHandler::resetCooldowns() const
+{
+    if (packetVersion < 20160622)
+        return;
+    createOutPacket(CMSG_ADMIN_RESET_COOLDOWNS);
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index 24a1238ea..af34b1cb1 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -160,6 +160,8 @@ class AdminHandler final : public Ea::AdminHandler
 
         void changeDress() const override final;
 
+        void resetCooldowns() const override final;
+
     protected:
         static std::string mStatsName;
 };
diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc
index ae03a13e2..7c1a19e3a 100644
--- a/src/net/eathena/packetsout.inc
+++ b/src/net/eathena/packetsout.inc
@@ -357,6 +357,7 @@ packet(CMSG_NPC_BARTER_BUY,               0x0000,   0, nullptr);
 packet(CMSG_CLIENT_VERSION,               0x0000,   0, nullptr);
 packet(CMSG_PLAYER_STYLE_CLOSE,           0x0000,   0, nullptr);
 packet(CMSG_MAP_PING2,                    0x0000,   0, nullptr);
+packet(CMSG_ADMIN_RESET_COOLDOWNS,        0x0000,   0, nullptr);
 #else
 // 20040713
 if (packetVersion >= 20040713)
@@ -1602,4 +1603,10 @@ if (packetVersionMain >= 20190227)
     packet(CMSG_MAP_PING2,                0x0b1c,   2, clif->pPing);
 }
 
+// 20160622
+if (packetVersion >= 20160622)
+{
+    packet(CMSG_ADMIN_RESET_COOLDOWNS,    0x0a88,   2, clif->pResetCooldown);
+}
+
 #endif
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index bd1d86f42..3ec67f1e0 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -300,4 +300,8 @@ void AdminHandler::changeDress() const
 {
 }
 
+void AdminHandler::resetCooldowns() const
+{
+}
+
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 998d6c947..259d73fb4 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -159,6 +159,8 @@ class AdminHandler final : public Ea::AdminHandler
         void slide(const int x, const int y) const override final;
 
         void changeDress() const override final;
+
+        void resetCooldowns() const override final;
 };
 
 }  // namespace TmwAthena