Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Searing totem is no longer kamikaze

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-05-03 18:03:01 +02:00
parent 0085572de1
commit 977295bb59
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/game/Totem.cpp
View File

@@ -84,6 +84,15 @@ void Totem::InitSummon(uint32 duration)
data << GetGUID();
SendMessageToSet(&data,true);
// Get spell casted by totem
SpellEntry const * totemSpell = sSpellStore.LookupEntry(GetSpell());
if (totemSpell)
{
// If spell have cast time -> so its active totem
if (GetSpellCastTime(totemSpell))
m_type = TOTEM_ACTIVE;
}
if(m_type == TOTEM_PASSIVE)
CastSpell(this, GetSpell(), true);
@@ -93,15 +102,6 @@ void Totem::InitSummon(uint32 duration)
m_duration = duration;
SetLevel(m_owner->getLevel());
// Get spell casted by totem
SpellEntry const * totemSpell = sSpellStore.LookupEntry(GetSpell());
if (totemSpell)
{
// If spell have cast time -> so its active totem
if (GetSpellCastTime(totemSpell))
m_type = TOTEM_ACTIVE;
}
}
void Totem::UnSummon()

1
src/game/Totem.h
View File

@@ -51,7 +51,6 @@ class Totem : public Minion
void UpdateMaxPower(Powers /*power*/) {}
void UpdateAttackPowerAndDamage(bool /*ranged*/ ) {}
void UpdateDamagePhysical(WeaponAttackType /*attType*/) {}
void SetDuration(int32 dur) { m_duration = dur; }
bool IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const;

2
src/game/Unit.cpp
View File

@@ -3953,7 +3953,7 @@ void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit
int32 damage = aur->GetPartAura(0)->GetAmount()*9;
RemoveAuraFromStack(iter, AURA_REMOVE_BY_ENEMY_SPELL);
// backfire damage and silence
dispeler->CastCustomSpell(dispeler, 31117, &damage, NULL, NULL, true, NULL, NULL,GetGUID());
dispeler->CastCustomSpell(this, 31117, &damage, NULL, NULL, true, NULL, NULL,dispeler->GetGUID());
return;
}
RemoveAuraFromStack(iter, AURA_REMOVE_BY_ENEMY_SPELL);