From 7cfe3c002126c17bdc5aedf9fe40ea6d39cefbbf Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 8 Sep 2021 23:26:14 -0400 Subject: [PATCH] Core/Spell: fix SendSpellMiss requiring caster Unit Port From (https://github.com/TrinityCore/TrinityCore/commit/60ff73eeba93c7f97abff0eeb504cb4b5ff8a6cd) --- Source/Game/Entities/Object/WorldObject.cs | 9 +++++++++ Source/Game/Entities/Unit/Unit.Spells.cs | 8 -------- Source/Game/Spells/Spell.cs | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Source/Game/Entities/Object/WorldObject.cs b/Source/Game/Entities/Object/WorldObject.cs index bf4d34535..cc0e34f9a 100644 --- a/Source/Game/Entities/Object/WorldObject.cs +++ b/Source/Game/Entities/Object/WorldObject.cs @@ -2028,6 +2028,15 @@ namespace Game.Entities return SpellMissInfo.None; } + public void SendSpellMiss(Unit target, uint spellID, SpellMissInfo missInfo) + { + SpellMissLog spellMissLog = new(); + spellMissLog.SpellID = spellID; + spellMissLog.Caster = GetGUID(); + spellMissLog.Entries.Add(new SpellLogMissEntry(target.GetGUID(), (byte)missInfo)); + SendMessageToSet(spellMissLog, true); + } + public FactionTemplateRecord GetFactionTemplateEntry() { var entry = CliDB.FactionTemplateStorage.LookupByKey(GetFaction()); diff --git a/Source/Game/Entities/Unit/Unit.Spells.cs b/Source/Game/Entities/Unit/Unit.Spells.cs index 9ab56ab1c..47de23c42 100644 --- a/Source/Game/Entities/Unit/Unit.Spells.cs +++ b/Source/Game/Entities/Unit/Unit.Spells.cs @@ -2103,14 +2103,6 @@ namespace Game.Entities SendCombatLogMessage(data); } - public void SendSpellMiss(Unit target, uint spellID, SpellMissInfo missInfo) - { - SpellMissLog spellMissLog = new(); - spellMissLog.SpellID = spellID; - spellMissLog.Caster = GetGUID(); - spellMissLog.Entries.Add(new SpellLogMissEntry(target.GetGUID(), (byte)missInfo)); - SendMessageToSet(spellMissLog, true); - } void SendSpellDamageResist(Unit target, uint spellId) { diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs index 4c30f2551..16b2b228a 100644 --- a/Source/Game/Spells/Spell.cs +++ b/Source/Game/Spells/Spell.cs @@ -7700,7 +7700,7 @@ namespace Game.Spells if (missInfo != SpellMissInfo.None) { if (missInfo != SpellMissInfo.Miss) - spell.GetCaster().ToUnit().SendSpellMiss(unit, spell.m_spellInfo.Id, missInfo); + spell.GetCaster().SendSpellMiss(unit, spell.m_spellInfo.Id, missInfo); spell.m_damage = 0; spell.m_healing = 0; _spellHitTarget = null;