diff options
Diffstat (limited to 'src/server/game/Handlers/NPCHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/NPCHandler.cpp | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index beca093a6a9..ddde13ae860 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -16,26 +16,29 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "WorldSession.h" +#include "Battleground.h" +#include "BattlegroundMgr.h" #include "Common.h" -#include "Language.h" +#include "Creature.h" +#include "CreatureAI.h" #include "DatabaseEnv.h" -#include "QueryCallback.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "Opcodes.h" +#include "DBCStores.h" +#include "GossipDef.h" +#include "Item.h" +#include "Language.h" #include "Log.h" +#include "Map.h" +#include "Opcodes.h" #include "ObjectMgr.h" -#include "SpellMgr.h" -#include "Player.h" -#include "GossipDef.h" -#include "Creature.h" #include "Pet.h" +#include "Player.h" +#include "QueryCallback.h" #include "ReputationMgr.h" -#include "BattlegroundMgr.h" -#include "Battleground.h" #include "ScriptMgr.h" -#include "CreatureAI.h" #include "SpellInfo.h" +#include "SpellMgr.h" +#include "WorldPacket.h" enum StableResultCode { @@ -373,11 +376,11 @@ void WorldSession::SendSpiritResurrect() _player->DurabilityLossAll(0.25f, true); // get corpse nearest graveyard - WorldSafeLocsEntry const* corpseGrave = NULL; + WorldSafeLocsEntry const* corpseGrave = nullptr; WorldLocation corpseLocation = _player->GetCorpseLocation(); if (_player->HasCorpse()) { - corpseGrave = sObjectMgr->GetClosestGraveYard(corpseLocation.GetPositionX(), corpseLocation.GetPositionY(), + corpseGrave = sObjectMgr->GetClosestGraveyard(corpseLocation.GetPositionX(), corpseLocation.GetPositionY(), corpseLocation.GetPositionZ(), corpseLocation.GetMapId(), _player->GetTeam()); } @@ -387,7 +390,7 @@ void WorldSession::SendSpiritResurrect() // teleport to nearest from corpse graveyard, if different from nearest to player ghost if (corpseGrave) { - WorldSafeLocsEntry const* ghostGrave = sObjectMgr->GetClosestGraveYard( + WorldSafeLocsEntry const* ghostGrave = sObjectMgr->GetClosestGraveyard( _player->GetPositionX(), _player->GetPositionY(), _player->GetPositionZ(), _player->GetMapId(), _player->GetTeam()); if (corpseGrave != ghostGrave) @@ -675,7 +678,7 @@ void WorldSession::HandleUnstablePetCallback(uint32 petId, PreparedQueryResult r if (!newPet->LoadPetFromDB(_player, petEntry, petId)) { delete newPet; - newPet = NULL; + newPet = nullptr; SendStableResult(STABLE_ERR_STABLE); return; } |