Merge pull request #6798 from Vincent-Michael/instanceCommand

Scripts/Commands: Convert instance commands in commandscript

4 files changed, 2 insertions, 141 deletions

diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index cc64a8e22dd..72011a339f8 100755
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -156,15 +156,6 @@ ChatCommand* ChatHandler::getCommandTable()
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 
-    static ChatCommand instanceCommandTable[] =
-    {
-        { "listbinds",      SEC_ADMINISTRATOR,  false, OldHandler<&ChatHandler::HandleInstanceListBindsCommand>,   "", NULL },
-        { "unbind",         SEC_ADMINISTRATOR,  false, OldHandler<&ChatHandler::HandleInstanceUnbindCommand>,      "", NULL },
-        { "stats",          SEC_ADMINISTRATOR,  true,  OldHandler<&ChatHandler::HandleInstanceStatsCommand>,       "", NULL },
-        { "savedata",       SEC_ADMINISTRATOR,  false, OldHandler<&ChatHandler::HandleInstanceSaveDataCommand>,    "", NULL },
-        { NULL,             0,                  false, NULL,                                           "", NULL }
-    };
-
     static ChatCommand listCommandTable[] =
     {
         { "creature",       SEC_ADMINISTRATOR,  true,  OldHandler<&ChatHandler::HandleListCreatureCommand>,        "", NULL },
@@ -339,7 +330,6 @@ ChatCommand* ChatHandler::getCommandTable()
         { "group",          SEC_ADMINISTRATOR,  false, NULL,                                           "", groupCommandTable    },
         { "cast",           SEC_ADMINISTRATOR,  false, NULL,                                           "", castCommandTable     },
         { "reset",          SEC_ADMINISTRATOR,  true,  NULL,                                           "", resetCommandTable    },
-        { "instance",       SEC_ADMINISTRATOR,  true,  NULL,                                           "", instanceCommandTable },
         { "server",         SEC_ADMINISTRATOR,  true,  NULL,                                           "", serverCommandTable   },
 
         { "channel",        SEC_ADMINISTRATOR, true, NULL,                                             "", channelCommandTable  },
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index e88914a2daf..0a5cd9391f6 100755
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -180,11 +180,6 @@ class ChatHandler
         bool HandleGuildRankCommand(const char* args);
         bool HandleGuildDeleteCommand(const char* args);
 
-        bool HandleInstanceListBindsCommand(const char* args);
-        bool HandleInstanceUnbindCommand(const char* args);
-        bool HandleInstanceStatsCommand(const char* args);
-        bool HandleInstanceSaveDataCommand(const char * args);
-
         bool HandleListAurasCommand(const char * args);
         bool HandleListCreatureCommand(const char* args);
         bool HandleListItemCommand(const char* args);
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index 4b2f1c5e7bb..4decc7a523f 100755
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -4096,132 +4096,6 @@ bool ChatHandler::HandleCastSelfCommand(const char *args)
     return true;
 }
 
-std::string GetTimeString(uint64 time)
-{
-    uint64 days = time / DAY, hours = (time % DAY) / HOUR, minute = (time % HOUR) / MINUTE;
-    std::ostringstream ss;
-    if (days) ss << days << "d ";
-    if (hours) ss << hours << "h ";
-    ss << minute << 'm';
-    return ss.str();
-}
-
-bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/)
-{
-    Player* player = getSelectedPlayer();
-    if (!player) player = m_session->GetPlayer();
-    uint32 counter = 0;
-    for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
-    {
-        Player::BoundInstancesMap &binds = player->GetBoundInstances(Difficulty(i));
-        for (Player::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr)
-        {
-            InstanceSave* save = itr->second.save;
-            std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL));
-            PSendSysMessage("map: %d inst: %d perm: %s diff: %d canReset: %s TTR: %s", itr->first, save->GetInstanceId(), itr->second.perm ? "yes" : "no",  save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str());
-            counter++;
-        }
-    }
-    PSendSysMessage("player binds: %d", counter);
-    counter = 0;
-    Group* group = player->GetGroup();
-    if (group)
-    {
-        for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
-        {
-            Group::BoundInstancesMap &binds = group->GetBoundInstances(Difficulty(i));
-            for (Group::BoundInstancesMap::const_iterator itr = binds.begin(); itr != binds.end(); ++itr)
-            {
-                InstanceSave* save = itr->second.save;
-                std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL));
-                PSendSysMessage("map: %d inst: %d perm: %s diff: %d canReset: %s TTR: %s", itr->first, save->GetInstanceId(), itr->second.perm ? "yes" : "no",  save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str());
-                counter++;
-            }
-        }
-    }
-    PSendSysMessage("group binds: %d", counter);
-
-    return true;
-}
-
-bool ChatHandler::HandleInstanceUnbindCommand(const char *args)
-{
-    if (!*args)
-        return false;
-
-    Player* player = getSelectedPlayer();
-    if (!player)
-        player = m_session->GetPlayer();
-
-    char* map = strtok((char*)args, " ");
-    char* pDiff = strtok(NULL, " ");
-    int8 diff = -1;
-    if (pDiff)
-        diff = atoi(pDiff);
-    uint16 counter = 0;
-    uint16 MapId = 0;
-
-    if (strcmp(map, "all"))
-    {
-        MapId = uint16(atoi(map));
-        if (!MapId)
-            return false;
-    }
-
-    for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
-    {
-        Player::BoundInstancesMap &binds = player->GetBoundInstances(Difficulty(i));
-        for (Player::BoundInstancesMap::iterator itr = binds.begin(); itr != binds.end();)
-        {
-            InstanceSave* save = itr->second.save;
-            if (itr->first != player->GetMapId() && (!MapId || MapId == itr->first) && (diff == -1 || diff == save->GetDifficulty()))
-            {
-                std::string timeleft = GetTimeString(save->GetResetTime() - time(NULL));
-                PSendSysMessage("unbinding map: %d inst: %d perm: %s diff: %d canReset: %s TTR: %s", itr->first, save->GetInstanceId(), itr->second.perm ? "yes" : "no", save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str());
-                player->UnbindInstance(itr, Difficulty(i));
-                counter++;
-            }
-            else
-                ++itr;
-        }
-    }
-    PSendSysMessage("instances unbound: %d", counter);
-    return true;
-}
-
-bool ChatHandler::HandleInstanceStatsCommand(const char* /*args*/)
-{
-    PSendSysMessage("instances loaded: %d", sMapMgr->GetNumInstances());
-    PSendSysMessage("players in instances: %d", sMapMgr->GetNumPlayersInInstances());
-    PSendSysMessage("instance saves: %d", sInstanceSaveMgr->GetNumInstanceSaves());
-    PSendSysMessage("players bound: %d", sInstanceSaveMgr->GetNumBoundPlayersTotal());
-    PSendSysMessage("groups bound: %d", sInstanceSaveMgr->GetNumBoundGroupsTotal());
-    return true;
-}
-
-bool ChatHandler::HandleInstanceSaveDataCommand(const char * /*args*/)
-{
-    Player* player = m_session->GetPlayer();
-
-    Map* map = player->GetMap();
-    if (!map->IsDungeon())
-    {
-        PSendSysMessage("Map is not a dungeon.");
-        SetSentErrorMessage(true);
-        return false;
-    }
-
-    if (!((InstanceMap*)map)->GetInstanceScript())
-    {
-        PSendSysMessage("Map has no instance data.");
-        SetSentErrorMessage(true);
-        return false;
-    }
-
-    ((InstanceMap*)map)->GetInstanceScript()->SaveToDB();
-    return true;
-}
-
 /// Define the 'Message of the day' for the realm
 bool ChatHandler::HandleServerSetMotdCommand(const char *args)
 {
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index f64d0953e86..a1a23ca7074 100755
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -52,6 +52,7 @@ void AddSC_gm_commandscript();
 void AddSC_go_commandscript();
 void AddSC_gobject_commandscript();
 void AddSC_honor_commandscript();
+void AddSC_instance_commandscript();
 void AddSC_learn_commandscript();
 void AddSC_misc_commandscript();
 void AddSC_modify_commandscript();
@@ -654,6 +655,7 @@ void AddCommandScripts()
     AddSC_go_commandscript();
     AddSC_gobject_commandscript();
     AddSC_honor_commandscript();
+    AddSC_instance_commandscript();
     AddSC_learn_commandscript();
     AddSC_misc_commandscript();
     AddSC_modify_commandscript();