Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Allow filtering procs in FINISH phase by SpellTypeMask

Browse Source
This commit is contained in:
Shauren
2023-06-29 00:06:49 +02:00
parent 94c8dbb421
commit bacfbec251
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Spells/Spell.cpp
View File

@@ -577,6 +577,7 @@ m_spellValue(new SpellValue(m_spellInfo, caster)), _spellEvent(nullptr)
m_damage = 0;
m_healing = 0;
m_hitMask = PROC_HIT_NONE;
m_procSpellType = PROC_SPELL_TYPE_NONE;
focusObject = nullptr;
m_castId = ObjectGuid::Create<HighGuid::Cast>(SPELL_CAST_SOURCE_NORMAL, m_caster->GetMapId(), m_spellInfo->Id, m_caster->GetMap()->GenerateLowGuid<HighGuid::Cast>());
m_originalCastId = originalCastId;
@@ -2941,6 +2942,7 @@ void Spell::TargetInfo::DoDamageAndTriggers(Spell* spell)
// set hitmask for finish procs
spell->m_hitMask |= hitMask;
spell->m_procSpellType |= procSpellType;
// Do not take combo points on dodge and miss
if (MissCondition != SPELL_MISS_NONE && spell->m_needComboPoints && spell->m_targets.GetUnitTargetGUID() == TargetGUID)
@@ -3977,7 +3979,10 @@ void Spell::handle_immediate()
// consider spell hit for some spells without target, so they may proc on finish phase correctly
if (m_UniqueTargetInfo.empty())
{
m_hitMask = PROC_HIT_NORMAL;
m_procSpellType = PROC_SPELL_TYPE_NO_DMG_HEAL;
}
else
DoProcessTargetContainer(m_UniqueTargetInfo);
@@ -4169,7 +4174,7 @@ void Spell::_handle_finish_phase()
}
if (!m_spellInfo->HasAttribute(SPELL_ATTR3_SUPPRESS_CASTER_PROCS))
Unit::ProcSkillsAndAuras(m_originalCaster, nullptr, procAttacker, PROC_FLAG_NONE, PROC_SPELL_TYPE_MASK_ALL, PROC_SPELL_PHASE_FINISH, m_hitMask, this, nullptr, nullptr);
Unit::ProcSkillsAndAuras(m_originalCaster, nullptr, procAttacker, PROC_FLAG_NONE, m_procSpellType, PROC_SPELL_PHASE_FINISH, m_hitMask, this, nullptr, nullptr);
}
void Spell::SendSpellCooldown()

2
src/server/game/Spells/Spell.h
View File

@@ -63,6 +63,7 @@ enum AuraType : uint32;
enum CurrentSpellTypes : uint8;
enum LootType : uint8;
enum ProcFlagsHit : uint32;
enum ProcFlagsSpellType : uint32;
enum SpellTargetCheckTypes : uint8;
enum SpellTargetObjectTypes : uint8;
enum SpellValueMod : uint8;
@@ -735,6 +736,7 @@ class TC_GAME_API Spell
ProcFlagsInit m_procAttacker; // Attacker trigger flags
ProcFlagsInit m_procVictim; // Victim trigger flags
ProcFlagsHit m_hitMask;
ProcFlagsSpellType m_procSpellType; // for finish procs
void prepareDataForTriggerSystem();
// *****************************************