mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8111] Implemented support for implicit specify owner when initializing stats for summoned pets.

Browse source 
* Speedup of summoning pets (no need to seach owner by guid)
* Fixed problem that summond pets from NPC had not initialized stats
  (pet was not in world in time of stat init thus owner was not found)

Signed-off-by: ApoC <apoc@nymfe.net>
This commit is contained in:
ApoC 2009-07-03 19:24:45 +02:00
parent 06dcbce4ee
commit aab121fcb2
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/game/Pet.cpp
View file

@ -798,16 +798,19 @@ bool Pet::CreateBaseAtCreature(Creature* creature)
return true; return true;
} }
bool Pet::InitStatsForLevel(uint32 petlevel) bool Pet::InitStatsForLevel(uint32 petlevel, Unit* owner)
{ {
CreatureInfo const *cinfo = GetCreatureInfo(); CreatureInfo const *cinfo = GetCreatureInfo();
assert(cinfo); assert(cinfo);
Unit* owner = GetOwner();
if(!owner) if(!owner)
{ {
sLog.outError("attempt to summon pet (Entry %u) without owner! Attempt terminated.", cinfo->Entry); owner = GetOwner();
return false; if(!owner)
{
sLog.outError("attempt to summon pet (Entry %u) without owner! Attempt terminated.", cinfo->Entry);
return false;
}
} }
uint32 creature_ID = (getPetType() == HUNTER_PET) ? 1 : cinfo->Entry; uint32 creature_ID = (getPetType() == HUNTER_PET) ? 1 : cinfo->Entry;

2
src/game/Pet.h
View file

@ -161,7 +161,7 @@ class Pet : public Creature
void GivePetXP(uint32 xp); void GivePetXP(uint32 xp);
void GivePetLevel(uint32 level); void GivePetLevel(uint32 level);
void SynchronizeLevelWithOwner(); void SynchronizeLevelWithOwner();
bool InitStatsForLevel(uint32 level); bool InitStatsForLevel(uint32 level, Unit* owner = NULL);
bool HaveInDiet(ItemPrototype const* item) const; bool HaveInDiet(ItemPrototype const* item) const;
uint32 GetCurrentFoodBenefitLevel(uint32 itemlevel); uint32 GetCurrentFoodBenefitLevel(uint32 itemlevel);
void SetDuration(int32 dur) { m_duration = dur; } void SetDuration(int32 dur) { m_duration = dur; }

6
src/game/SpellEffects.cpp
View file

@ -3275,7 +3275,7 @@ void Spell::EffectSummon(uint32 i)
spawnCreature->SetCreatorGUID(m_caster->GetGUID()); spawnCreature->SetCreatorGUID(m_caster->GetGUID());
spawnCreature->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id); spawnCreature->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
spawnCreature->InitStatsForLevel(level); spawnCreature->InitStatsForLevel(level, m_caster);
spawnCreature->GetCharmInfo()->SetPetNumber(pet_number, false); spawnCreature->GetCharmInfo()->SetPetNumber(pet_number, false);
@ -3705,7 +3705,7 @@ void Spell::EffectSummonGuardian(uint32 i)
spawnCreature->SetCreatorGUID(m_caster->GetGUID()); spawnCreature->SetCreatorGUID(m_caster->GetGUID());
spawnCreature->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id); spawnCreature->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
spawnCreature->InitStatsForLevel(level); spawnCreature->InitStatsForLevel(level, m_caster);
spawnCreature->GetCharmInfo()->SetPetNumber(pet_number, false); spawnCreature->GetCharmInfo()->SetPetNumber(pet_number, false);
spawnCreature->AIM_Initialize(); spawnCreature->AIM_Initialize();
@ -4195,7 +4195,7 @@ void Spell::EffectSummonPet(uint32 i)
if(m_caster->IsPvP()) if(m_caster->IsPvP())
NewSummon->SetPvP(true); NewSummon->SetPvP(true);
NewSummon->InitStatsForLevel(petlevel); NewSummon->InitStatsForLevel(petlevel, m_caster);
NewSummon->InitPetCreateSpells(); NewSummon->InitPetCreateSpells();
NewSummon->InitLevelupSpellsForLevel(); NewSummon->InitLevelupSpellsForLevel();
NewSummon->InitTalentForLevel(); NewSummon->InitTalentForLevel();

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8110" #define REVISION_NR "8111"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__