diff options
| author | Gildor <gildor55@gmail.com> | 2023-09-18 11:48:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-18 11:48:52 +0200 |
| commit | edb00d4f7432575965e8e3630f505c2ef09ed3b2 (patch) | |
| tree | 6217cf997ba0b23ad0ceb6a03221b23c20c1ea11 /src | |
| parent | 6b9899e907a8ee7f6686419e67aaabb62d8d3a5a (diff) | |
Core/Pets: Avoid loading creature_addon/creature_template_addon (#29331)
*Also removed spawnId when the pet is created
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 98ebb98f2bd..089a414f7a2 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2041,7 +2041,9 @@ void Creature::setDeathState(DeathState s) Motion_Initialize(); Unit::setDeathState(ALIVE); - LoadCreaturesAddon(); + + if (!IsPet()) + LoadCreaturesAddon(); } } diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index d4b8d373fc8..1b26f6a4f82 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1874,7 +1874,6 @@ bool Pet::Create(ObjectGuid::LowType guidlow, Map* map, uint32 phaseMask, uint32 SetPhaseMask(phaseMask, false); Object::_Create(guidlow, petId, HighGuid::Pet); - m_spawnId = guidlow; m_originalEntry = Entry; if (!InitEntry(Entry)) |