aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2012-04-18 12:44:56 +0200
committerShauren <shauren.trinity@gmail.com>2012-04-18 12:44:56 +0200
commitbec761a3e0809c93ca0dd84844ed9635fcce2ac6 (patch)
tree41ff72c9bcd7ae198a76bb23352b6fc1633e357c
parent1be4027a9082c4cd746849697d8409077907348b (diff)
Core/Creatures: Set melee sheath as default only for creatures that do not have creature_addon data
-rwxr-xr-xsrc/server/game/Entities/Creature/Creature.cpp5
1 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 6a8ae07291a..a7b57c7323c 100755
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -357,8 +357,9 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData* data)
m_regenHealth = cInfo->RegenHealth;
- // creatures always have melee weapon ready if any
- SetSheath(SHEATH_STATE_MELEE);
+ // creatures always have melee weapon ready if any unless specified otherwise
+ if (!GetCreatureAddon())
+ SetSheath(SHEATH_STATE_MELEE);
SelectLevel(GetCreatureTemplate());
if (team == HORDE)