Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h

1 files changed, 180 insertions, 0 deletions

diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp
new file mode 100644
index 00000000000..7284e6ad6b7
--- /dev/null
+++ b/src/server/scripts/Commands/cs_bf.cpp
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* ScriptData
+Name: bf_commandscript
+%Complete: 100
+Comment: All bf related commands
+Category: commandscripts
+EndScriptData */
+
+#include "ScriptMgr.h"
+#include "Chat.h"
+#include "BattlefieldMgr.h"
+
+class bf_commandscript : public CommandScript
+{
+public:
+    bf_commandscript() : CommandScript("bf_commandscript") { }
+
+    ChatCommand* GetCommands() const
+    {
+        static ChatCommand battlefieldcommandTable[] =
+        {
+            { "start",          SEC_ADMINISTRATOR,  false, &HandleBattlefieldStart,            "", NULL },
+            { "stop",           SEC_ADMINISTRATOR,  false, &HandleBattlefieldEnd,              "", NULL },
+            { "switch",         SEC_ADMINISTRATOR,  false, &HandleBattlefieldSwitch,           "", NULL },
+            { "timer",          SEC_ADMINISTRATOR,  false, &HandleBattlefieldTimer,            "", NULL },
+            { "enable",         SEC_ADMINISTRATOR,  false, &HandleBattlefieldEnable,           "", NULL },
+            { NULL,             0,                  false, NULL,                               "", NULL }
+        };
+        static ChatCommand commandTable[] =
+        {
+            { "bf",             SEC_ADMINISTRATOR,  false, NULL,            "", battlefieldcommandTable },
+            { NULL,             0,                  false, NULL,                               "", NULL }
+        };
+        return commandTable;
+    }
+
+    static bool HandleBattlefieldStart(ChatHandler* handler, const char* args)
+    {
+        uint32 battleid = 0;
+        char* battleid_str = strtok((char*)args, " ");
+        if (!battleid_str)
+            return false;
+
+        battleid = atoi(battleid_str);
+
+        Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
+
+        if (!bf)
+            return false;
+
+        bf->StartBattle();
+
+        if (battleid == 1)
+            handler->SendGlobalGMSysMessage("Wintergrasp (Command start used)");
+
+        return true;
+    }
+
+    static bool HandleBattlefieldEnd(ChatHandler* handler, const char* args)
+    {
+        uint32 battleid = 0;
+        char* battleid_str = strtok((char*)args, " ");
+        if (!battleid_str)
+            return false;
+
+        battleid = atoi(battleid_str);
+
+        Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
+
+        if (!bf)
+            return false;
+
+        bf->EndBattle(true);
+
+        if (battleid == 1)
+            handler->SendGlobalGMSysMessage("Wintergrasp (Command stop used)");
+
+        return true;
+    }
+
+    static bool HandleBattlefieldEnable(ChatHandler* handler, const char* args)
+    {
+        uint32 battleid = 0;
+        char* battleid_str = strtok((char*)args, " ");
+        if (!battleid_str)
+            return false;
+
+        battleid = atoi(battleid_str);
+
+        Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
+
+        if (!bf)
+            return false;
+
+        if (bf->IsEnabled())
+        {
+            bf->ToggleBattlefield(false);
+            if (battleid == 1)
+                handler->SendGlobalGMSysMessage("Wintergrasp is disabled");
+        }
+        else
+        {
+            bf->ToggleBattlefield(true);
+            if (battleid == 1)
+                handler->SendGlobalGMSysMessage("Wintergrasp is enabled");
+        }
+
+        return true;
+    }
+
+    static bool HandleBattlefieldSwitch(ChatHandler* handler, const char* args)
+    {
+        uint32 battleid = 0;
+        char* battleid_str = strtok((char*)args, " ");
+        if (!battleid_str)
+            return false;
+
+        battleid = atoi(battleid_str);
+
+        Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
+
+        if (!bf)
+            return false;
+
+        bf->EndBattle(false);
+        if (battleid == 1)
+            handler->SendGlobalGMSysMessage("Wintergrasp (Command switch used)");
+
+        return true;
+    }
+
+    static bool HandleBattlefieldTimer(ChatHandler* handler, const char* args)
+    {
+        uint32 battleid = 0;
+        uint32 time = 0;
+        char* battleid_str = strtok((char*)args, " ");
+        if (!battleid_str)
+            return false;
+        char* time_str = strtok(NULL, " ");
+        if (!time_str)
+            return false;
+
+        battleid = atoi(battleid_str);
+
+        time = atoi(time_str);
+
+        Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
+
+        if (!bf)
+            return false;
+
+        bf->SetTimer(time * IN_MILLISECONDS);
+        bf->SendInitWorldStatesToAll();
+        if (battleid == 1)
+            handler->SendGlobalGMSysMessage("Wintergrasp (Command timer used)");
+
+        return true;
+    }
+};
+
+void AddSC_bf_commandscript()
+{
+    new bf_commandscript();
+}