[6809] Not reset display model at shapeshift aura remove if it not se…

…t at apply. This must resolve problems with model reset at warrior stance switch. Signed-off-by: VladimirMangos <vladimir@getmangos.com>
Yorge · Nov 9, 2008 · 9c60c4d · 9c60c4d
1 parent 2797ae4
commit 9c60c4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
@@ -2567,7 +2567,8 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
     }
     else
     {
-        m_target->SetDisplayId(m_target->GetNativeDisplayId());
+        if(modelid > 0)
+            m_target->SetDisplayId(m_target->GetNativeDisplayId());
         m_target->SetByteValue(UNIT_FIELD_BYTES_2, 3, FORM_NONE);
         if(m_target->getClass() == CLASS_DRUID)
             m_target->setPowerType(POWER_MANA);

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "6808"
+ #define REVISION_NR "6809"
 #endif // __REVISION_NR_H__