diff options
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() |