Core: Updated to 11.2.0
Port From (https://github.com/TrinityCore/TrinityCore/commit/5cf0c6c8bb2c4e58a2d66ba5f304af34d18a4782)
This commit is contained in:
@@ -4471,6 +4471,7 @@ namespace Game.Spells
|
||||
unitCaster.ClearChannelObjects();
|
||||
unitCaster.SetChannelSpellId(0);
|
||||
unitCaster.SetChannelVisual(new SpellCastVisualField());
|
||||
unitCaster.SetChannelSpellData(0, 0);
|
||||
unitCaster.SetSpellEmpowerStage(-1);
|
||||
}
|
||||
|
||||
@@ -4550,6 +4551,7 @@ namespace Game.Spells
|
||||
|
||||
unitCaster.SetChannelSpellId(m_spellInfo.Id);
|
||||
unitCaster.SetChannelVisual(m_SpellVisual);
|
||||
unitCaster.SetChannelSpellData(GameTime.GetGameTimeMS(), duration);
|
||||
|
||||
void setImmunitiesAndHealPrediction(ref SpellChannelStartInterruptImmunities? interruptImmunities, ref SpellTargetedHealPrediction? healPrediction)
|
||||
{
|
||||
|
||||
@@ -992,9 +992,9 @@ namespace Game.Spells
|
||||
if (chargeCategoryEntry == null)
|
||||
return 0;
|
||||
|
||||
uint charges = chargeCategoryEntry.MaxCharges;
|
||||
charges += (uint)_owner.GetTotalAuraModifierByMiscValue(AuraType.ModMaxCharges, (int)chargeCategoryId);
|
||||
return (int)charges;
|
||||
int charges = chargeCategoryEntry.MaxCharges;
|
||||
charges += _owner.GetTotalAuraModifierByMiscValue(AuraType.ModMaxCharges, (int)chargeCategoryId);
|
||||
return charges;
|
||||
}
|
||||
|
||||
public int GetChargeRecoveryTime(uint chargeCategoryId)
|
||||
|
||||
@@ -4898,6 +4898,10 @@ namespace Game.Spells
|
||||
new StaticData(SpellEffectImplicitTargetTypes.None, SpellTargetObjectTypes.None), // 339 SPELL_EFFECT_UI_ACTION
|
||||
new StaticData(SpellEffectImplicitTargetTypes.None, SpellTargetObjectTypes.None), // 340 SPELL_EFFECT_340
|
||||
new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Unit), // 341 SPELL_EFFECT_LEARN_WARBAND_SCENE
|
||||
new StaticData(SpellEffectImplicitTargetTypes.None, SpellTargetObjectTypes.None), // 342 SPELL_EFFECT_342
|
||||
new StaticData(SpellEffectImplicitTargetTypes.None, SpellTargetObjectTypes.None), // 343 SPELL_EFFECT_343
|
||||
new StaticData(SpellEffectImplicitTargetTypes.None, SpellTargetObjectTypes.None), // 344 SPELL_EFFECT_344
|
||||
new StaticData(SpellEffectImplicitTargetTypes.None, SpellTargetObjectTypes.None), // 345 SPELL_EFFECT_ASSIST_ACTION
|
||||
};
|
||||
|
||||
#region Fields
|
||||
|
||||
@@ -3716,6 +3716,15 @@ namespace Game.Entities
|
||||
});
|
||||
});
|
||||
|
||||
// Summon Faol in Tirisfal
|
||||
ApplySpellFix([202112], spellInfo =>
|
||||
{
|
||||
ApplySpellEffectFix(spellInfo, 0, spellEffectInfo =>
|
||||
{
|
||||
spellEffectInfo.TargetA = new SpellImplicitTargetInfo(Targets.DestDb);
|
||||
});
|
||||
});
|
||||
|
||||
//
|
||||
// VIOLET HOLD SPELLS
|
||||
//
|
||||
@@ -4385,7 +4394,7 @@ namespace Game.Entities
|
||||
});
|
||||
|
||||
// Flame Spout
|
||||
ApplySpellFix([ 114685 ], spellInfo =>
|
||||
ApplySpellFix([114685], spellInfo =>
|
||||
{
|
||||
spellInfo.AttributesEx |= SpellAttr1.NoThreat;
|
||||
spellInfo.AttributesEx8 |= SpellAttr8.CanAttackImmunePC;
|
||||
@@ -4692,17 +4701,23 @@ namespace Game.Entities
|
||||
});
|
||||
|
||||
// Keg Smash
|
||||
ApplySpellFix([ 121253 ], spellInfo =>
|
||||
ApplySpellFix([121253], spellInfo =>
|
||||
{
|
||||
spellInfo._LoadSqrtTargetLimit(5, 0, null, 6, null, null);
|
||||
});
|
||||
|
||||
// Odyn's Fury
|
||||
ApplySpellFix([ 385060, 385061, 385062 ], spellInfo =>
|
||||
ApplySpellFix([385060, 385061, 385062], spellInfo =>
|
||||
{
|
||||
spellInfo._LoadSqrtTargetLimit(5, 0, 385059, 5, null, null);
|
||||
});
|
||||
|
||||
// Flamestrike
|
||||
ApplySpellFix([ 2120 ], spellInfo =>
|
||||
{
|
||||
spellInfo._LoadSqrtTargetLimit(8, 0, null, 2, null, null);
|
||||
});
|
||||
|
||||
Log.outInfo(LogFilter.ServerLoading, $"Loaded SpellInfo target caps in {Time.GetMSTimeDiffToNow(oldMSTime)} ms");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user