diff options
Diffstat (limited to 'src/server/scripts/Commands')
29 files changed, 110 insertions, 83 deletions
diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 5c8332beba8..bfb9897cbf3 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -24,10 +24,12 @@ EndScriptData */ #include "AccountMgr.h" #include "Chat.h" +#include "DatabaseEnv.h" #include "Language.h" #include "Log.h" #include "Player.h" #include "ScriptMgr.h" +#include "World.h" #include <boost/asio/ip/address_v4.hpp> class account_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_arena.cpp b/src/server/scripts/Commands/cs_arena.cpp index 8ffb641d7d3..10194b7c896 100644 --- a/src/server/scripts/Commands/cs_arena.cpp +++ b/src/server/scripts/Commands/cs_arena.cpp @@ -22,10 +22,11 @@ Comment: All arena team related commands Category: commandscripts EndScriptData */ -#include "ObjectMgr.h" +#include "ArenaTeamMgr.h" #include "Chat.h" #include "Language.h" -#include "ArenaTeamMgr.h" +#include "Log.h" +#include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index 3d1b5982523..c81ca30355b 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -24,11 +24,13 @@ EndScriptData */ #include "AccountMgr.h" #include "Chat.h" +#include "DatabaseEnv.h" #include "Language.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" +#include "World.h" class ban_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_battlenet_account.cpp b/src/server/scripts/Commands/cs_battlenet_account.cpp index c62db6d774b..6365cdc4b17 100644 --- a/src/server/scripts/Commands/cs_battlenet_account.cpp +++ b/src/server/scripts/Commands/cs_battlenet_account.cpp @@ -15,9 +15,11 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "BattlenetAccountMgr.h" #include "AccountMgr.h" +#include "BattlenetAccountMgr.h" +#include "BigNumber.h" #include "Chat.h" +#include "DatabaseEnv.h" #include "Language.h" #include "Log.h" #include "Player.h" diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index f0151fca3d6..51ee5c0b313 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -24,11 +24,14 @@ EndScriptData */ #include "AccountMgr.h" #include "Chat.h" +#include "DatabaseEnv.h" +#include "Log.h" #include "ObjectMgr.h" #include "PlayerDump.h" #include "Player.h" #include "ReputationMgr.h" #include "ScriptMgr.h" +#include "World.h" class character_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index be738602fe3..f98d5e35a4c 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -22,24 +22,24 @@ Comment: All debug related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "ObjectMgr.h" #include "BattlefieldMgr.h" #include "BattlegroundMgr.h" -#include "Chat.h" #include "Cell.h" #include "CellImpl.h" +#include "Chat.h" #include "Conversation.h" +#include "GossipDef.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "GossipDef.h" -#include "M2Stores.h" -#include "Transport.h" #include "Language.h" +#include "Log.h" +#include "M2Stores.h" #include "MapManager.h" #include "MovementPackets.h" +#include "ObjectMgr.h" +#include "ScriptMgr.h" #include "SpellPackets.h" - +#include "Transport.h" #include <fstream> #include <limits> @@ -379,26 +379,6 @@ public: parsedStream >> val6; data << val6; } - else if (type == "appitsguid") - { - data << unit->GetPackGUID(); - } - else if (type == "appmyguid") - { - data << player->GetPackGUID(); - } - else if (type == "appgoguid") - { - GameObject* obj = handler->GetNearbyGameObject(); - if (!obj) - { - handler->PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, UI64LIT(0)); - handler->SetSentErrorMessage(true); - ifs.close(); - return false; - } - data << obj->GetPackGUID(); - } else if (type == "goguid") { GameObject* obj = handler->GetNearbyGameObject(); diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index 0349f4eb83f..6c1df3910c5 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -22,9 +22,10 @@ Comment: All disable related commands Category: commandscripts EndScriptData */ -#include "DisableMgr.h" -#include "CriteriaHandler.h" #include "Chat.h" +#include "CriteriaHandler.h" +#include "DatabaseEnv.h" +#include "DisableMgr.h" #include "Language.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index 17abb11f790..a625b9d3a33 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -22,14 +22,16 @@ Comment: All gm related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "ObjectMgr.h" -#include "Chat.h" #include "AccountMgr.h" +#include "Chat.h" +#include "DatabaseEnv.h" #include "Language.h" -#include "World.h" -#include "Player.h" +#include "ObjectMgr.h" #include "Opcodes.h" +#include "Player.h" +#include "Realm.h" +#include "ScriptMgr.h" +#include "World.h" #include <boost/thread/shared_mutex.hpp> #include <boost/thread/locks.hpp> diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index edb9dc7440f..802f8830ff8 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -22,13 +22,14 @@ Comment: All go related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "ObjectMgr.h" -#include "MapManager.h" -#include "SupportMgr.h" #include "Chat.h" +#include "DatabaseEnv.h" #include "Language.h" +#include "MapManager.h" +#include "ObjectMgr.h" #include "Player.h" +#include "ScriptMgr.h" +#include "SupportMgr.h" #include "Transport.h" class go_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 016fc358468..9fafa61be20 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -22,15 +22,17 @@ Comment: All gobject related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "GameEventMgr.h" -#include "ObjectMgr.h" -#include "PoolMgr.h" -#include "MapManager.h" #include "Chat.h" +#include "DatabaseEnv.h" +#include "GameEventMgr.h" #include "Language.h" -#include "Player.h" +#include "Log.h" +#include "MapManager.h" +#include "ObjectMgr.h" #include "Opcodes.h" +#include "Player.h" +#include "PoolMgr.h" +#include "ScriptMgr.h" class gobject_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp index 981bfcf852c..8abad46babe 100644 --- a/src/server/scripts/Commands/cs_group.cpp +++ b/src/server/scripts/Commands/cs_group.cpp @@ -16,11 +16,12 @@ */ #include "Chat.h" +#include "DatabaseEnv.h" +#include "GroupMgr.h" #include "Language.h" #include "LFG.h" -#include "Player.h" #include "ObjectMgr.h" -#include "GroupMgr.h" +#include "Player.h" #include "ScriptMgr.h" class group_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index a2c722082b3..d21357a8ef9 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -28,6 +28,7 @@ EndScriptData */ #include "Guild.h" #include "GuildMgr.h" #include "ObjectAccessor.h" +#include "ObjectMgr.h" #include "ScriptMgr.h" #include <iomanip> diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp index 66144be75b6..07123744e18 100644 --- a/src/server/scripts/Commands/cs_lfg.cpp +++ b/src/server/scripts/Commands/cs_lfg.cpp @@ -15,14 +15,15 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" #include "Chat.h" +#include "DatabaseEnv.h" +#include "Group.h" +#include "GroupMgr.h" #include "Language.h" #include "LFGMgr.h" #include "ObjectMgr.h" -#include "Group.h" -#include "GroupMgr.h" #include "Player.h" +#include "ScriptMgr.h" void GetPlayerInfo(ChatHandler* handler, Player* player) { diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index cc61406ebdf..c324c292463 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -22,14 +22,14 @@ Comment: All list related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" -#include "SpellAuraEffects.h" +#include "DatabaseEnv.h" #include "Language.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" -#include <iostream> +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" class list_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index 18e15346679..19fa8fde081 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -24,6 +24,7 @@ EndScriptData */ #include "AccountMgr.h" #include "Chat.h" +#include "DatabaseEnv.h" #include "GameEventMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" @@ -31,6 +32,7 @@ EndScriptData */ #include "ReputationMgr.h" #include "ScriptMgr.h" #include "SpellInfo.h" +#include "World.h" class lookup_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp index 85c7c5edafa..e9c681f1904 100644 --- a/src/server/scripts/Commands/cs_message.cpp +++ b/src/server/scripts/Commands/cs_message.cpp @@ -22,13 +22,15 @@ Comment: All message related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" #include "Channel.h" #include "ChannelMgr.h" +#include "DatabaseEnv.h" #include "Language.h" #include "Player.h" #include "ObjectMgr.h" +#include "ScriptMgr.h" +#include "World.h" class message_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 3a57c4ccd69..35fe2ed5e89 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -15,32 +15,37 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "DB2Stores.h" -#include "Chat.h" -#include "ScriptMgr.h" #include "AccountMgr.h" #include "ArenaTeamMgr.h" #include "CellImpl.h" +#include "Chat.h" +#include "DatabaseEnv.h" +#include "DB2Stores.h" +#include "DisableMgr.h" #include "GridNotifiers.h" #include "Group.h" +#include "GroupMgr.h" #include "InstanceSaveMgr.h" #include "Language.h" +#include "LFG.h" +#include "Log.h" +#include "MapManager.h" +#include "MiscPackets.h" +#include "MMapFactory.h" #include "MovementGenerator.h" #include "ObjectAccessor.h" #include "Opcodes.h" -#include "SpellAuras.h" -#include "TargetedMovementGenerator.h" -#include "WeatherMgr.h" -#include "Player.h" #include "Pet.h" -#include "LFG.h" -#include "GroupMgr.h" -#include "MMapFactory.h" -#include "DisableMgr.h" +#include "Player.h" +#include "Realm.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" #include "SpellHistory.h" -#include "MiscPackets.h" +#include "TargetedMovementGenerator.h" #include "Transport.h" -#include "MapManager.h" +#include "Weather.h" +#include "WeatherMgr.h" +#include "World.h" #include <boost/asio/ip/address_v4.hpp> // temporary hack until database includes are sorted out (don't want to pull in Windows.h everywhere from mysql.h) @@ -186,7 +191,7 @@ public: { case HighGuid::Player: { - object = sObjectMgr->GetPlayerByLowGUID(guidLow); + object = ObjectAccessor::FindConnectedPlayer(ObjectGuid::Create<HighGuid::Player>(guidLow)); if (!object) { handler->SendSysMessage(LANG_PLAYER_NOT_FOUND); @@ -823,7 +828,7 @@ public: { case HighGuid::Player: { - object = sObjectMgr->GetPlayerByLowGUID(guidLow); + object = ObjectAccessor::GetPlayer(*handler->GetSession()->GetPlayer(), ObjectGuid::Create<HighGuid::Player>(guidLow)); if (!object) { handler->SendSysMessage(LANG_PLAYER_NOT_FOUND); @@ -1358,7 +1363,7 @@ public: return false; } - Item* item = playerTarget->StoreNewItem(dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId), GuidSet(), 0, bonusListIDs); + Item* item = playerTarget->StoreNewItem(dest, itemId, true, GenerateItemRandomPropertyId(itemId), GuidSet(), 0, bonusListIDs); // remove binding (let GM give it to another player later) if (player == playerTarget) diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 4071a8f4ed2..bc8940a88a1 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -23,7 +23,7 @@ Category: commandscripts EndScriptData */ #include "Chat.h" -#include "ObjectMgr.h" +#include "Log.h" #include "Opcodes.h" #include "Pet.h" #include "Player.h" @@ -741,14 +741,14 @@ public: target->Mount(mId); WorldPacket data(SMSG_MOVE_SET_RUN_SPEED, (8+4+1+4)); - data << target->GetPackGUID(); + data << target->GetGUID(); data << (uint32)0; data << (uint8)0; //new 2.1.0 data << float(speed); target->SendMessageToSet(&data, true); data.Initialize(SMSG_MOVE_SET_SWIM_SPEED, (8+4+4)); - data << target->GetPackGUID(); + data << target->GetGUID(); data << (uint32)0; data << float(speed); target->SendMessageToSet(&data, true); diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index ec7835b5654..34f77727ca3 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -22,16 +22,19 @@ Comment: All npc related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "ObjectMgr.h" #include "Chat.h" -#include "Transport.h" +#include "CreatureAI.h" #include "CreatureGroups.h" +#include "DatabaseEnv.h" #include "Language.h" -#include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand -#include "CreatureAI.h" -#include "Player.h" +#include "Log.h" +#include "ObjectMgr.h" #include "Pet.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand +#include "Transport.h" +#include "World.h" template<typename E, typename T = char const*> struct EnumName diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index c82129ca7ec..7591600365a 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -17,6 +17,7 @@ #include "Chat.h" #include "Language.h" +#include "Log.h" #include "Pet.h" #include "Player.h" #include "ObjectMgr.h" diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 6f377270ae4..5234b3c240b 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -23,10 +23,12 @@ Category: commandscripts EndScriptData */ #include "Chat.h" +#include "DatabaseEnv.h" #include "ObjectMgr.h" #include "Player.h" #include "ReputationMgr.h" #include "ScriptMgr.h" +#include "World.h" class quest_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_rbac.cpp b/src/server/scripts/Commands/cs_rbac.cpp index eb646d8bcd8..a07bc32fd38 100644 --- a/src/server/scripts/Commands/cs_rbac.cpp +++ b/src/server/scripts/Commands/cs_rbac.cpp @@ -23,11 +23,13 @@ Category: commandscripts EndScriptData */ #include "AccountMgr.h" -#include "Config.h" #include "Chat.h" +#include "Config.h" #include "Language.h" #include "Player.h" +#include "Realm.h" #include "ScriptMgr.h" +#include "World.h" struct RBACCommandData { diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 2732d6d8be7..5c467c9e021 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -31,9 +31,12 @@ EndScriptData */ #include "Chat.h" #include "ConversationDataStore.h" #include "CreatureTextMgr.h" +#include "DatabaseEnv.h" #include "DisableMgr.h" #include "Language.h" #include "LFGMgr.h" +#include "Log.h" +#include "LootMgr.h" #include "MapManager.h" #include "ObjectMgr.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index f94a0220a3c..ebce9ccd9c4 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -24,12 +24,14 @@ EndScriptData */ #include "AchievementMgr.h" #include "Chat.h" +#include "DatabaseEnv.h" #include "Language.h" #include "Log.h" #include "ObjectAccessor.h" #include "Player.h" #include "Pet.h" #include "ScriptMgr.h" +#include "World.h" #include <boost/thread/shared_mutex.hpp> #include <boost/thread/locks.hpp> diff --git a/src/server/scripts/Commands/cs_send.cpp b/src/server/scripts/Commands/cs_send.cpp index 2a35b190bbe..724a1ef7567 100644 --- a/src/server/scripts/Commands/cs_send.cpp +++ b/src/server/scripts/Commands/cs_send.cpp @@ -16,6 +16,7 @@ */ #include "Chat.h" +#include "DatabaseEnv.h" #include "Language.h" #include "Pet.h" #include "Player.h" diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index b807ee30bfa..d02e3da9208 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -24,13 +24,14 @@ EndScriptData */ #include "Chat.h" #include "Config.h" +#include "GitRevision.h" #include "Language.h" #include "Log.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptMgr.h" -#include "GitRevision.h" #include "Util.h" +#include "World.h" class server_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 5579080a648..c910b942bbf 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -23,6 +23,7 @@ Category: commandscripts EndScriptData */ #include "Chat.h" +#include "DatabaseEnv.h" #include "Group.h" #include "Language.h" #include "MapManager.h" diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp index f9a0cef1c66..1f305b8983f 100644 --- a/src/server/scripts/Commands/cs_ticket.cpp +++ b/src/server/scripts/Commands/cs_ticket.cpp @@ -29,8 +29,10 @@ EndScriptData */ #include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" +#include "Realm.h" #include "ScriptMgr.h" #include "SupportMgr.h" +#include "World.h" class ticket_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 6aac5045d78..620b68950a4 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -23,6 +23,7 @@ Category: commandscripts EndScriptData */ #include "Chat.h" +#include "DatabaseEnv.h" #include "Language.h" #include "ObjectMgr.h" #include "Player.h" |