Merge branch 'master' into 4.x

1 files changed, 2 insertions, 1 deletions

diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 553d4037430..fd0a05f469c 100755
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -636,7 +636,8 @@ class World
         void SendServerMessage(ServerMessageType type, const char *text = "", Player* player = NULL);
 
         /// Are we in the middle of a shutdown?
-        bool IsShutdowning() const { return m_ShutdownTimer > 0; }
+        bool IsShuttingDown() const { return m_ShutdownTimer > 0; }
+        uint32 GetShutDownTimeLeft() const { return m_ShutdownTimer; }
         void ShutdownServ(uint32 time, uint32 options, uint8 exitcode);
         void ShutdownCancel();
         void ShutdownMsg(bool show = false, Player* player = NULL);