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

Core/Spell: register spell mod owner properly on spell cast

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/71c2fda1132d5fba3864f133d0e3ee4e81de508f)
This commit is contained in:
hondacrx
2020-05-12 23:46:57 -04:00
parent 09f26b305f
commit 86c88330d6
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+16 -14
View File
@@ -2621,11 +2621,12 @@ namespace Game.Spells
m_caster.SetInFront(m_targets.GetObjectTarget()); m_caster.SetInFront(m_targets.GetObjectTarget());
// Should this be done for original caster? // Should this be done for original caster?
if (m_caster.IsTypeId(TypeId.Player)) Player modOwner = m_caster.GetSpellModOwner();
if (modOwner !=null)
{ {
// Set spell which will drop charges for triggered cast spells // Set spell which will drop charges for triggered cast spells
// if not successfully casted, will be remove in finish(false) // if not successfully casted, will be remove in finish(false)
m_caster.ToPlayer().SetSpellModTakingSpell(this, true); modOwner.SetSpellModTakingSpell(this, true);
} }
CallScriptBeforeCastHandlers(); CallScriptBeforeCastHandlers();
@@ -2640,8 +2641,8 @@ namespace Game.Spells
SendCastResult(castResult, param1, param2); SendCastResult(castResult, param1, param2);
SendInterrupted(0); SendInterrupted(0);
if (m_caster.IsTypeId(TypeId.Player)) if (modOwner)
m_caster.ToPlayer().SetSpellModTakingSpell(this, false); modOwner.SetSpellModTakingSpell(this, false);
Finish(false); Finish(false);
SetExecutedCurrently(false); SetExecutedCurrently(false);
@@ -2652,9 +2653,9 @@ namespace Game.Spells
// if trade not complete then remember it in trade data // if trade not complete then remember it in trade data
if (Convert.ToBoolean(m_targets.GetTargetMask() & SpellCastTargetFlags.TradeItem)) if (Convert.ToBoolean(m_targets.GetTargetMask() & SpellCastTargetFlags.TradeItem))
{ {
if (m_caster.IsTypeId(TypeId.Player)) if (modOwner)
{ {
TradeData my_trade = m_caster.ToPlayer().GetTradeData(); TradeData my_trade = modOwner.GetTradeData();
if (my_trade != null) if (my_trade != null)
{ {
if (!my_trade.IsInAcceptProcess()) if (!my_trade.IsInAcceptProcess())
@@ -2664,7 +2665,7 @@ namespace Game.Spells
SendCastResult(SpellCastResult.DontReport); SendCastResult(SpellCastResult.DontReport);
SendInterrupted(0); SendInterrupted(0);
m_caster.ToPlayer().SetSpellModTakingSpell(this, false); modOwner.SetSpellModTakingSpell(this, false);
Finish(false); Finish(false);
SetExecutedCurrently(false); SetExecutedCurrently(false);
@@ -2792,12 +2793,12 @@ namespace Game.Spells
} }
} }
if (m_caster.IsTypeId(TypeId.Player)) if (modOwner != null)
{ {
m_caster.ToPlayer().SetSpellModTakingSpell(this, false); modOwner.SetSpellModTakingSpell(this, false);
//Clear spell cooldowns after every spell is cast if .cheat cooldown is enabled. //Clear spell cooldowns after every spell is cast if .cheat cooldown is enabled.
if (m_caster.ToPlayer().GetCommandStatus(PlayerCommandStates.Cooldown)) if (modOwner.GetCommandStatus(PlayerCommandStates.Cooldown))
{ {
m_caster.GetSpellHistory().ResetCooldown(m_spellInfo.Id, true); m_caster.GetSpellHistory().ResetCooldown(m_spellInfo.Id, true);
m_caster.GetSpellHistory().RestoreCharge(m_spellInfo.ChargeCategoryId); m_caster.GetSpellHistory().RestoreCharge(m_spellInfo.ChargeCategoryId);
@@ -2929,8 +2930,9 @@ namespace Game.Spells
if (single_missile && offset == 0) if (single_missile && offset == 0)
return m_delayMoment; return m_delayMoment;
if (m_caster.IsTypeId(TypeId.Player)) Player modOwner = m_caster.GetSpellModOwner();
m_caster.ToPlayer().SetSpellModTakingSpell(this, true); if (modOwner != null)
modOwner.SetSpellModTakingSpell(this, true);
PrepareTargetProcessing(); PrepareTargetProcessing();
@@ -2969,8 +2971,8 @@ namespace Game.Spells
FinishTargetProcessing(); FinishTargetProcessing();
if (m_caster.IsTypeId(TypeId.Player)) if (modOwner)
m_caster.ToPlayer().SetSpellModTakingSpell(this, false); modOwner.SetSpellModTakingSpell(this, false);
// All targets passed - need finish phase // All targets passed - need finish phase
if (next_time == 0) if (next_time == 0)