From 5b7b6c5494f5a581a812dffd66931f00bf970ba5 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 13 Jun 2023 08:53:51 -0400 Subject: [PATCH] Core/Spells: Corrected effect type implicit targeting for SPELL_EFFECT_CREATE_PRIVATE_CONVERSATION Port From (https://github.com/TrinityCore/TrinityCore/commit/d419fe5ff4ce9d3227ddcc47cc21ed67732e3d52) --- Source/Game/Spells/SpellEffects.cs | 7 +++---- Source/Game/Spells/SpellInfo.cs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs index ffb2788aa..69cd926b9 100644 --- a/Source/Game/Spells/SpellEffects.cs +++ b/Source/Game/Spells/SpellEffects.cs @@ -5628,14 +5628,13 @@ namespace Game.Spells [SpellEffectHandler(SpellEffectName.CreatePrivateConversation)] void EffectCreatePrivateConversation() { - if (effectHandleMode != SpellEffectHandleMode.Hit) + if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - Unit unitCaster = GetUnitCasterForEffectHandlers(); - if (unitCaster == null || !unitCaster.IsPlayer()) + if (unitTarget.GetTypeId() != TypeId.Player) return; - Conversation.CreateConversation((uint)effectInfo.MiscValue, unitCaster, destTarget.GetPosition(), unitCaster.GetGUID(), GetSpellInfo()); + Conversation.CreateConversation((uint)effectInfo.MiscValue, unitTarget, destTarget.GetPosition(), unitTarget.GetGUID(), GetSpellInfo()); } [SpellEffectHandler(SpellEffectName.SendChatMessage)] diff --git a/Source/Game/Spells/SpellInfo.cs b/Source/Game/Spells/SpellInfo.cs index b01e2fdc8..75375a6db 100644 --- a/Source/Game/Spells/SpellInfo.cs +++ b/Source/Game/Spells/SpellInfo.cs @@ -4783,7 +4783,7 @@ namespace Game.Spells new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Item), // 264 SPELL_EFFECT_REMOVE_GEM new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Unit), // 265 SPELL_EFFECT_LEARN_AZERITE_ESSENCE_POWER new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Item), // 266 SPELL_EFFECT_SET_ITEM_BONUS_LIST_GROUP_ENTRY - new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Unit), // 267 SPELL_EFFECT_CREATE_PRIVATE_CONVERSATION + new StaticData(SpellEffectImplicitTargetTypes.Caster, SpellTargetObjectTypes.Unit), // 267 SPELL_EFFECT_CREATE_PRIVATE_CONVERSATION new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Unit), // 268 SPELL_EFFECT_APPLY_MOUNT_EQUIPMENT new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Item), // 269 SPELL_EFFECT_INCREASE_ITEM_BONUS_LIST_GROUP_STEP new StaticData(SpellEffectImplicitTargetTypes.Explicit, SpellTargetObjectTypes.Unit), // 270 SPELL_EFFECT_270