diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Entities/Pet/Pet.cpp | 5 | ||||
| -rw-r--r-- | src/game/Server/WorldSession.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/game/Entities/Pet/Pet.cpp b/src/game/Entities/Pet/Pet.cpp index 8bb6fdaeb8..a0f34e86df 100644 --- a/src/game/Entities/Pet/Pet.cpp +++ b/src/game/Entities/Pet/Pet.cpp @@ -977,6 +977,9 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) // Can be summon and guardian if (GetEntry() == NPC_RISEN_GHOUL) { + // 100% energy after summon + SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY)); + // xinef: fixes orc death knight command racial if (m_owner->getRace() == RACE_ORC) CastSpell(this, SPELL_ORC_RACIAL_COMMAND, true, NULL, NULL, m_owner->GetGUID()); @@ -2240,4 +2243,4 @@ void Pet::RemoveSpellCooldown(uint32 spell_id, bool update /* = false */) playerOwner->SendDirectMessage(&data); } } -}
\ No newline at end of file +} diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp index e07ba35333..fac6ac4bfb 100644 --- a/src/game/Server/WorldSession.cpp +++ b/src/game/Server/WorldSession.cpp @@ -1081,9 +1081,9 @@ void WorldSession::InitializeQueryCallbackParameters() { // Callback parameters that have pointers in them should be properly // initialized to NULL here. - _charCreateCallback.SetParam(NULL); - _loadPetFromDBFirstCallback.SetFirstParam(NULL); - _loadPetFromDBFirstCallback.SetSecondParam(NULL); + _charCreateCallback.SetParam(nullptr); + _loadPetFromDBFirstCallback.SetFirstParam(0); + _loadPetFromDBFirstCallback.SetSecondParam(nullptr); } void WorldSession::ProcessQueryCallbacks() |