Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Implemented SPELL_ATTR9_FORCE_CORPSE_TARGET

Browse Source
This commit is contained in:
Shauren
2024-07-03 00:08:40 +02:00
parent 09cdfbfba2
commit af39104798
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Miscellaneous/SharedDefines.h
View File

@@ -786,7 +786,7 @@ enum SpellAttr9 : uint32
SPELL_ATTR9_IGNORE_CASTER_HEALING_MODIFIERS = 0x01000000, // TITLE Ignore Caster Healing Modifiers
SPELL_ATTR9_DONT_CONSUME_CHARGE_IF_ITEM_DELETED = 0x02000000, /*NYI - some sort of bugfix attribute to prevent double item deletion?*/ // TITLE (Programmer Only) Don't consume charge if item deleted
SPELL_ATTR9_ITEM_PASSIVE_ON_CLIENT = 0x04000000, // TITLE Item Passive On Client
SPELL_ATTR9_UNK27 = 0x08000000, // TITLE Unknown attribute 27@Attr9
SPELL_ATTR9_FORCE_CORPSE_TARGET = 0x08000000, // TITLE Force Corpse Target DESCRIPTION Causes the spell to continue executing effects on the target even if one of them kills it
SPELL_ATTR9_UNK28 = 0x10000000, // TITLE Unknown attribute 28@Attr9
SPELL_ATTR9_UNK29 = 0x20000000, // TITLE Unknown attribute 29@Attr9
SPELL_ATTR9_UNK30 = 0x40000000, // TITLE Unknown attribute 30@Attr9

6
src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp
View File

@@ -1462,7 +1462,7 @@ TC_API_EXPORT EnumText EnumUtils<SpellAttr9>::ToString(SpellAttr9 value)
case SPELL_ATTR9_IGNORE_CASTER_HEALING_MODIFIERS: return { "SPELL_ATTR9_IGNORE_CASTER_HEALING_MODIFIERS", "Ignore Caster Healing Modifiers", "" };
case SPELL_ATTR9_DONT_CONSUME_CHARGE_IF_ITEM_DELETED: return { "SPELL_ATTR9_DONT_CONSUME_CHARGE_IF_ITEM_DELETED", "(Programmer Only) Don't consume charge if item deleted", "" };
case SPELL_ATTR9_ITEM_PASSIVE_ON_CLIENT: return { "SPELL_ATTR9_ITEM_PASSIVE_ON_CLIENT", "Item Passive On Client", "" };
case SPELL_ATTR9_UNK27: return { "SPELL_ATTR9_UNK27", "Unknown attribute 27@Attr9", "" };
case SPELL_ATTR9_FORCE_CORPSE_TARGET: return { "SPELL_ATTR9_FORCE_CORPSE_TARGET", "Force Corpse Target", "Causes the spell to continue executing effects on the target even if one of them kills it" };
case SPELL_ATTR9_UNK28: return { "SPELL_ATTR9_UNK28", "Unknown attribute 28@Attr9", "" };
case SPELL_ATTR9_UNK29: return { "SPELL_ATTR9_UNK29", "Unknown attribute 29@Attr9", "" };
case SPELL_ATTR9_UNK30: return { "SPELL_ATTR9_UNK30", "Unknown attribute 30@Attr9", "" };
@@ -1506,7 +1506,7 @@ TC_API_EXPORT SpellAttr9 EnumUtils<SpellAttr9>::FromIndex(size_t index)
case 24: return SPELL_ATTR9_IGNORE_CASTER_HEALING_MODIFIERS;
case 25: return SPELL_ATTR9_DONT_CONSUME_CHARGE_IF_ITEM_DELETED;
case 26: return SPELL_ATTR9_ITEM_PASSIVE_ON_CLIENT;
case 27: return SPELL_ATTR9_UNK27;
case 27: return SPELL_ATTR9_FORCE_CORPSE_TARGET;
case 28: return SPELL_ATTR9_UNK28;
case 29: return SPELL_ATTR9_UNK29;
case 30: return SPELL_ATTR9_UNK30;
@@ -1547,7 +1547,7 @@ TC_API_EXPORT size_t EnumUtils<SpellAttr9>::ToIndex(SpellAttr9 value)
case SPELL_ATTR9_IGNORE_CASTER_HEALING_MODIFIERS: return 24;
case SPELL_ATTR9_DONT_CONSUME_CHARGE_IF_ITEM_DELETED: return 25;
case SPELL_ATTR9_ITEM_PASSIVE_ON_CLIENT: return 26;
case SPELL_ATTR9_UNK27: return 27;
case SPELL_ATTR9_FORCE_CORPSE_TARGET: return 27;
case SPELL_ATTR9_UNK28: return 28;
case SPELL_ATTR9_UNK29: return 29;
case SPELL_ATTR9_UNK30: return 30;

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

@@ -2775,7 +2775,7 @@ void Spell::TargetInfo::DoTargetSpellHit(Spell* spell, SpellEffectInfo const& sp
spell->m_damage = Damage;
spell->m_healing = Healing;
if (unit->IsAlive() != IsAlive)
if (unit->IsAlive() != IsAlive && !spell->m_spellInfo->HasAttribute(SPELL_ATTR9_FORCE_CORPSE_TARGET))
return;
if (!spell->m_spellInfo->HasAttribute(SPELL_ATTR8_IGNORE_SANCTUARY) && spell->getState() == SPELL_STATE_DELAYED && !spell->IsPositive() && (GameTime::GetGameTimeMS() - TimeDelay) <= unit->m_lastSanctuaryTime)