aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorOvah <dreadkiller@gmx.de>2019-01-28 15:01:20 -0300
committerKeader <keader.android@gmail.com>2019-01-28 15:03:46 -0300
commit00958c9178781ac11a9dcabd034ed2e82120fad6 (patch)
tree00dc8cfc4a12f0079a7516eaff3b3df38040594c /src/server/game
parentfd69c133b10e289167f34438cb34fb5d4a141b4c (diff)
Scripts/Magister Terrace: Felblood Kaelthas rewrite
Cherrypick of https://github.com/Ovahlord/TrinityCore/commit/ae440400aaf90de11cf92010839ab98a8403c003
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp12
-rw-r--r--src/server/game/Spells/SpellMgr.cpp2
2 files changed, 2 insertions, 12 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index bd2dacb69ef..3341e877337 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -4445,20 +4445,8 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool
}
break;
case 36730: // Flame Strike
- {
target->CastSpell(target, 36731, this);
break;
- }
- case 44191: // Flame Strike
- {
- if (target->GetMap()->IsDungeon())
- {
- uint32 spellId = target->GetMap()->IsHeroic() ? 46163 : 44190;
-
- target->CastSpell(target, spellId, this);
- }
- break;
- }
case 43681: // Inactive
{
if (target->GetTypeId() != TYPEID_PLAYER || aurApp->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE)
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 2d2d85bcff6..21128456edc 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -4902,6 +4902,8 @@ void SpellMgr::LoadSpellInfoCorrections()
properties->Type = SUMMON_TYPE_TOTEM;
if (SummonPropertiesEntry* properties = const_cast<SummonPropertiesEntry*>(sSummonPropertiesStore.LookupEntry(628))) // Hungry Plaguehound
properties->Category = SUMMON_CATEGORY_PET;
+ if (SummonPropertiesEntry* properties = const_cast<SummonPropertiesEntry*>(sSummonPropertiesStore.LookupEntry(61))) // Summon Arcane Spheres
+ properties->Type = SUMMON_TYPE_NONE;
if (LockEntry* entry = const_cast<LockEntry*>(sLockStore.LookupEntry(36))) // 3366 Opening, allows to open without proper key
entry->Type[2] = LOCK_KEY_NONE;