diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 07b1a29bb3..611128ddb5 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2952,6 +2952,8 @@ SpellCastResult WorldObject::CastSpell(SpellCastTargets const& targets, uint32 s spell->m_CastItem = triggeringAuraCaster->GetItemByGuid(args.TriggeringAura->GetBase()->GetCastItemGUID()); } + spell->m_customArg = args.CustomArg; + return spell->prepare(targets, args.TriggeringAura); } diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 4e8a09314f..177b8a3d55 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -532,6 +532,7 @@ class TC_GAME_API Spell int8 m_comboPointGain; SpellCustomErrors m_customError; uint32 m_castFlagsEx; + std::any m_customArg; UsedSpellMods m_appliedMods; diff --git a/src/server/game/Spells/SpellDefines.h b/src/server/game/Spells/SpellDefines.h index 851c783fa5..5f1c9d9b6e 100644 --- a/src/server/game/Spells/SpellDefines.h +++ b/src/server/game/Spells/SpellDefines.h @@ -21,6 +21,7 @@ #include "Define.h" #include "EnumFlag.h" #include "ObjectGuid.h" +#include #include class Item; @@ -204,6 +205,7 @@ struct TC_GAME_API CastSpellExtraArgs CastSpellExtraArgs& SetOriginalCaster(ObjectGuid const& guid) { OriginalCaster = guid; return *this; } CastSpellExtraArgs& AddSpellMod(SpellValueMod mod, int32 val) { SpellValueOverrides.AddMod(mod, val); return *this; } CastSpellExtraArgs& AddSpellBP0(int32 val) { return AddSpellMod(SPELLVALUE_BASE_POINT0, val); } // because i don't want to type SPELLVALUE_BASE_POINT0 300 times + CastSpellExtraArgs& SetCustomArg(std::any customArg) { CustomArg = std::move(customArg); return *this; } TriggerCastFlags TriggerFlags = TRIGGERED_NONE; Item* CastItem = nullptr; @@ -223,6 +225,7 @@ struct TC_GAME_API CastSpellExtraArgs std::vector> data; } SpellValueOverrides; + std::any CustomArg; CastSpellExtraArgs(CastSpellExtraArgs const&) = delete; CastSpellExtraArgs(CastSpellExtraArgs&&) = delete;