diff options
| author | azazel <none@none> | 2010-08-06 12:28:37 +0600 |
|---|---|---|
| committer | azazel <none@none> | 2010-08-06 12:28:37 +0600 |
| commit | 4fb3098d189ba62290fcc0ed33f527a3743f05d9 (patch) | |
| tree | 92d6d2b0975b1ebaaff2d8c80d3d6f8d0409cd9c /src | |
| parent | 1565fe4ff40d193102da8edd49e0ea8d59728ae7 (diff) | |
* Add NULL-pointer check to CharmInfo destructor. Closes issue #3287.
* Remove references to AuctionHouseBot files from win project.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1e3bd84c780..117868a0b00 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16935,7 +16935,7 @@ void Player::LoadPet() if (IsInWorld()) { Pet *pet = new Pet(this); - if (!pet->LoadPetFromDB(this,0,0,true)) + if (!pet->LoadPetFromDB(this, 0, 0, true)) delete pet; } } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6f39eb63af8..f361d1ba95a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13491,9 +13491,8 @@ CharmInfo::CharmInfo(Unit* unit) CharmInfo::~CharmInfo() { if (m_unit->GetTypeId() == TYPEID_UNIT) - { - m_unit->ToCreature()->SetReactState(m_oldReactState); - } + if (Creature *pCreature = m_unit->ToCreature()) + pCreature->SetReactState(m_oldReactState); } void CharmInfo::InitPetActionBar() |