From 5dabd34bd4eea9488068ade4a214a34da8141f07 Mon Sep 17 00:00:00 2001 From: stormrage-project Date: Sat, 5 Sep 2015 09:27:29 +0200 Subject: [PATCH] [Command] Cleaning of the new GO commands implementation --- src/game/ChatCommands/Level2.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/game/ChatCommands/Level2.cpp b/src/game/ChatCommands/Level2.cpp index ea4bb057..f7359c12 100644 --- a/src/game/ChatCommands/Level2.cpp +++ b/src/game/ChatCommands/Level2.cpp @@ -63,7 +63,6 @@ #include "MoveMap.h" // for mmap manager #include "PathFinder.h" // for mmap commands #include "movement/MoveSplineInit.h" -#include "../../modules/SD2/include/sc_grid_searchers.h" static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] = { @@ -1143,10 +1142,6 @@ bool ChatHandler::HandleGameObjectAddCommand(char* args) bool ChatHandler::HandleGameObjectAnimationCommand(char* args) { - Player *pl = m_session->GetPlayer(); - if (!pl) - return false; - uint32 lowguid; if (!ExtractUInt32(&args, lowguid)) return false; @@ -1159,7 +1154,7 @@ bool ChatHandler::HandleGameObjectAnimationCommand(char* args) if (!goData) return false; - if (GameObject *go = GetClosestGameObjectWithEntry(pl, goData->id, 10.0f)) + if (GameObject *go = GetGameObjectWithGuid(lowguid, goData->id)) { if (type < 0) go->SendObjectDeSpawnAnim(go->GetObjectGuid()); @@ -1172,10 +1167,6 @@ bool ChatHandler::HandleGameObjectAnimationCommand(char* args) bool ChatHandler::HandleGameObjectLootstateCommand(char* args) { - Player *pl = m_session->GetPlayer(); - if (!pl) - return false; - uint32 lowguid; if (!ExtractUInt32(&args, lowguid)) return false; @@ -1188,7 +1179,7 @@ bool ChatHandler::HandleGameObjectLootstateCommand(char* args) if (!goData) return false; - if (GameObject *go = GetClosestGameObjectWithEntry(pl, goData->id, 10.0f)) + if (GameObject *go = GetGameObjectWithGuid(lowguid, goData->id)) { if (type < 0) PSendSysMessage(LANG_GET_GAMEOBJECT_LOOTSTATE, lowguid, go->getLootState()); @@ -1201,10 +1192,6 @@ bool ChatHandler::HandleGameObjectLootstateCommand(char* args) bool ChatHandler::HandleGameObjectStateCommand(char* args) { - Player *pl = m_session->GetPlayer(); - if (!pl) - return false; - uint32 lowguid; if (!ExtractUInt32(&args, lowguid)) return false; @@ -1217,7 +1204,7 @@ bool ChatHandler::HandleGameObjectStateCommand(char* args) if (!goData) return false; - if (GameObject *go = GetClosestGameObjectWithEntry(pl, goData->id, 10.0f)) + if (GameObject *go = GetGameObjectWithGuid(lowguid, goData->id)) { if (type < 0) PSendSysMessage(LANG_GET_GAMEOBJECT_STATE, lowguid, go->GetGoState());