aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-03-08 12:19:26 -0300
committerShauren <shauren.trinity@gmail.com>2019-08-17 20:04:14 +0200
commitc0b5e074c47bd8722b76e582336278bc55aa9320 (patch)
tree20b332ef07321c83588908384be80b9fbf4b25de /src
parent9d16dce63365502b45561ce972178a780272b146 (diff)
Core/Creature: restore previous behavior of random gender on respawn
Little regression added with 253c0f3d07e05557daa3ffdd4e2a2af4256fb65e (cherrypicked from 8089f1816c9b5a53a94711586530c808509c5f33)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index caa808db126..17c7dff60d0 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1959,7 +1959,11 @@ void Creature::Respawn(bool force)
setDeathState(JUST_RESPAWNED);
CreatureModel display(GetNativeDisplayId(), GetNativeDisplayScale(), 1.0f);
- SetDisplayId(display.CreatureDisplayID, display.DisplayScale);
+ if (sObjectMgr->GetCreatureModelRandomGender(&display, GetCreatureTemplate()))
+ {
+ SetDisplayId(display.CreatureDisplayID, display.DisplayScale);
+ SetNativeDisplayId(display.CreatureDisplayID, display.DisplayScale);
+ }
GetMotionMaster()->InitDefault();
//Re-initialize reactstate that could be altered by movementgenerators