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

[11635] Revert "[11615] Apply normal stealth at expire spell 1856 and ranks"

Browse source 
This reverts commit 1c0bd32c22b7d0116fab8d32b3b7e4f92c039b38.

Thanks to SeT for providing proves for commit wrong way work.
This commit is contained in:
VladimirMangos 2011-06-17 21:04:10 +04:00
parent 8a4230d765
commit f7e3b33eaf
3 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/game/SpellAuras.cpp
View file

@ -4422,23 +4422,8 @@ void Aura::HandleModStealth(bool apply, bool Real)
} }
else else
{ {
if (!Real)
return;
// Vanish (triggered, normal stealth need apply before remove advanced stealth)
if (target->GetTypeId() == TYPEID_PLAYER && m_removeMode == AURA_REMOVE_BY_EXPIRE &&
GetSpellProto()->IsFitToFamily(SPELLFAMILY_ROGUE, UI64LIT(0x000000000800)))
{
uint32 spellId = 1784; // Stealth
// reset cooldown on it if needed
if (((Player*)target)->HasSpellCooldown(spellId))
((Player*)target)->RemoveSpellCooldown(spellId);
target->CastSpell(target, spellId, true);
}
// only at real aura remove of _last_ SPELL_AURA_MOD_STEALTH // only at real aura remove of _last_ SPELL_AURA_MOD_STEALTH
if (!target->HasAuraType(SPELL_AURA_MOD_STEALTH)) if (Real && !target->HasAuraType(SPELL_AURA_MOD_STEALTH))
{ {
// if no GM invisibility // if no GM invisibility
if (target->GetVisibility()!=VISIBILITY_OFF) if (target->GetVisibility()!=VISIBILITY_OFF)

11
src/game/SpellEffects.cpp
View file

@ -3332,6 +3332,17 @@ void Spell::EffectTriggerSpell(SpellEffectIndex effIndex)
unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT); unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED); unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED); unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED);
// if this spell is given to NPC it must handle rest by it's own AI
if (unitTarget->GetTypeId() != TYPEID_PLAYER)
return;
uint32 spellId = 1784;
// reset cooldown on it if needed
if (((Player*)unitTarget)->HasSpellCooldown(spellId))
((Player*)unitTarget)->RemoveSpellCooldown(spellId);
m_caster->CastSpell(unitTarget, spellId, true);
return; return;
} }
// just skip // just skip

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 "11634" #define REVISION_NR "11635"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__