Core/Globals: Load spellspecific and aurastate after loading spell ranks

Core/Spells: Removed obsolete code
Core/Spell: do not fail triggered Charge effects in case a root is present.
This commit is contained in:
hondacrx
2017-12-30 16:53:56 -05:00
parent e7565adaf7
commit b180f6a9ba
3 changed files with 4 additions and 8 deletions
+3 -3
View File
@@ -371,9 +371,6 @@ namespace Game
Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo custom attributes..."); Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo custom attributes...");
Global.SpellMgr.LoadSpellInfoCustomAttributes(); Global.SpellMgr.LoadSpellInfoCustomAttributes();
Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo SpellSpecific and AuraState...");
Global.SpellMgr.LoadSpellInfoSpellSpecificAndAuraState();
Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo diminishing infos..."); Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo diminishing infos...");
Global.SpellMgr.LoadSpellInfoDiminishing(); Global.SpellMgr.LoadSpellInfoDiminishing();
@@ -439,6 +436,9 @@ namespace Game
Log.outInfo(LogFilter.ServerLoading, "Loading Spell Learn Skills..."); Log.outInfo(LogFilter.ServerLoading, "Loading Spell Learn Skills...");
Global.SpellMgr.LoadSpellLearnSkills(); Global.SpellMgr.LoadSpellLearnSkills();
Log.outInfo(LogFilter.ServerLoading, "Loading SpellInfo SpellSpecific and AuraState...");
Global.SpellMgr.LoadSpellInfoSpellSpecificAndAuraState();
Log.outInfo(LogFilter.ServerLoading, "Loading Spell Learn Spells..."); Log.outInfo(LogFilter.ServerLoading, "Loading Spell Learn Spells...");
Global.SpellMgr.LoadSpellLearnSpells(); Global.SpellMgr.LoadSpellLearnSpells();
+1 -1
View File
@@ -4928,7 +4928,7 @@ namespace Game.Spells
} }
case SpellEffectName.Charge: case SpellEffectName.Charge:
{ {
if (m_caster.HasUnitState(UnitState.Root)) if (!_triggeredCastFlags.HasAnyFlag(TriggerCastFlags.IgnoreCasterAuras) && m_caster.HasUnitState(UnitState.Root))
return SpellCastResult.Rooted; return SpellCastResult.Rooted;
if (GetSpellInfo().NeedsExplicitUnitTarget()) if (GetSpellInfo().NeedsExplicitUnitTarget())
-4
View File
@@ -1429,10 +1429,6 @@ namespace Game.Spells
case 8091: // Armor case 8091: // Armor
_spellSpecific = SpellSpecificType.Scroll; _spellSpecific = SpellSpecificType.Scroll;
break; break;
case 12880: // Enrage (Enrage)
case 57518: // Enrage (Wrecking Crew)
_spellSpecific = SpellSpecificType.WarriorEnrage;
break;
} }
} }
break; break;