Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc cleanups/DB updates

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore)
This commit is contained in:
hondacrx
2020-08-22 16:24:59 -04:00
parent 4d8e6a8a57
commit 8fc9c45d50
14 changed files with 84 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/SpellInfo.cs
+3 -4
View File
@@ -654,10 +654,9 @@ namespace Game.Spells
if (HasAttribute(SpellAttr1.UnaffectedBySchoolImmune) || HasAttribute(SpellAttr2.UnaffectedByAuraSchoolImmune))
{
// ...but not these (Divine shield, Ice block, Cyclone and Banish for example)
if (auraSpellInfo == null ||
(auraSpellInfo.Mechanic != Mechanics.ImmuneShield &&
auraSpellInfo.Mechanic != Mechanics.Invulnerability &&
(auraSpellInfo.Mechanic != Mechanics.Banish || (IsRankOf(auraSpellInfo) && auraSpellInfo.Dispel != DispelType.None)))) // Banish shouldn't be immune to itself, but Cyclone should
if (auraSpellInfo.Mechanic != Mechanics.ImmuneShield &&
auraSpellInfo.Mechanic != Mechanics.Invulnerability &&
(auraSpellInfo.Mechanic != Mechanics.Banish || (IsRankOf(auraSpellInfo) && auraSpellInfo.Dispel != DispelType.None))) // Banish shouldn't be immune to itself, but Cyclone should
return true;
}
Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/GrandChampions.cs
+2 -2
View File
@@ -176,7 +176,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion
if (player && !player.IsGameMaster() && me.IsInRange(player, 8.0f, 25.0f, false))
{
ResetThreatList();
me.GetThreatManager().AddThreat(player, 1.0f);
AddThreat(player, 1.0f);
DoCast(player, TrialOfChampionSpells.CHARGE);
break;
}
@@ -387,7 +387,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion
if (player && !player.IsGameMaster() && me.IsInRange(player, 8.0f, 25.0f, false))
{
ResetThreatList();
me.GetThreatManager().AddThreat(player, 5.0f);
AddThreat(player, 5.0f);
DoCast(player, TrialOfChampionSpells.INTERCEPT);
break;
}