mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12110] Keep equipment when transforming by spell

Browse source
This commit is contained in:
Schmoozerd 2012-08-22 15:35:07 +02:00 • committed by Antz
parent 801fd40aba
commit 68fe5fb4b0
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/SpellAuras.cpp
View file

@ -3855,7 +3855,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
break; break;
} }
} }
else else // m_modifier.m_miscvalue != 0
{ {
uint32 model_id; uint32 model_id;
@ -3876,9 +3876,9 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
target->SetDisplayId(model_id); target->SetDisplayId(model_id);
// creature case, need to update equipment // creature case, need to update equipment if additional provided
if (ci && target->GetTypeId() == TYPEID_UNIT) if (ci && target->GetTypeId() == TYPEID_UNIT)
((Creature*)target)->LoadEquipment(ci->equipmentId, true); ((Creature*)target)->LoadEquipment(ci->equipmentId, false);
// Dragonmaw Illusion (set mount model also) // Dragonmaw Illusion (set mount model also)
if (GetId() == 42016 && target->GetMountID() && !target->GetAurasByType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED).empty()) if (GetId() == 42016 && target->GetMountID() && !target->GetAurasByType(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED).empty())
@ -3902,7 +3902,7 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
target->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED, GetHolder()); target->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED, GetHolder());
} }
} }
else else // !apply
{ {
// ApplyModifier(true) will reapply it if need // ApplyModifier(true) will reapply it if need
target->setTransForm(0); target->setTransForm(0);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "0160" #define REVISION_NR "12110"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__