From 397d8555694f164eb3dbecbd368d059c99117192 Mon Sep 17 00:00:00 2001 From: Arthorius Date: Sun, 9 Nov 2008 09:41:31 +0300 Subject: [PATCH] [6809] Not reset display model at shapeshift aura remove if it not set at apply. This must resolve problems with model reset at warrior stance switch. Signed-off-by: VladimirMangos --- src/game/SpellAuras.cpp | 3 ++- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 79a4c9eed..44d50acde 100644 --- 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 index 9b275289f..3a485697c 100644 --- 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__