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_CANNOT_KILL_TARGET

Browse Source
This commit is contained in:
Shauren
2024-07-03 14:35:01 +02:00
parent 90610b4f6f
commit b3bdb4efef
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -940,6 +940,9 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit* excludeCasterChannel) cons
}
}
if (spellProto && spellProto->HasAttribute(SPELL_ATTR9_CANNOT_KILL_TARGET) && damageTaken >= health)
damageTaken = health - 1;
if (attacker && attacker != victim)
{
if (Player* killer = attacker->ToPlayer())

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

@@ -787,7 +787,7 @@ enum SpellAttr9 : uint32
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_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_CANNOT_KILL_TARGET = 0x10000000, // TITLE Cannot Kill Target
SPELL_ATTR9_UNK29 = 0x20000000, // TITLE Unknown attribute 29@Attr9
SPELL_ATTR9_UNK30 = 0x40000000, // TITLE Unknown attribute 30@Attr9
SPELL_ATTR9_UNK31 = 0x80000000 // TITLE Unknown attribute 31@Attr9

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

@@ -1463,7 +1463,7 @@ TC_API_EXPORT EnumText EnumUtils<SpellAttr9>::ToString(SpellAttr9 value)
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_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_CANNOT_KILL_TARGET: return { "SPELL_ATTR9_CANNOT_KILL_TARGET", "Cannot Kill Target", "" };
case SPELL_ATTR9_UNK29: return { "SPELL_ATTR9_UNK29", "Unknown attribute 29@Attr9", "" };
case SPELL_ATTR9_UNK30: return { "SPELL_ATTR9_UNK30", "Unknown attribute 30@Attr9", "" };
case SPELL_ATTR9_UNK31: return { "SPELL_ATTR9_UNK31", "Unknown attribute 31@Attr9", "" };
@@ -1507,7 +1507,7 @@ TC_API_EXPORT SpellAttr9 EnumUtils<SpellAttr9>::FromIndex(size_t index)
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_FORCE_CORPSE_TARGET;
case 28: return SPELL_ATTR9_UNK28;
case 28: return SPELL_ATTR9_CANNOT_KILL_TARGET;
case 29: return SPELL_ATTR9_UNK29;
case 30: return SPELL_ATTR9_UNK30;
case 31: return SPELL_ATTR9_UNK31;
@@ -1548,7 +1548,7 @@ TC_API_EXPORT size_t EnumUtils<SpellAttr9>::ToIndex(SpellAttr9 value)
case SPELL_ATTR9_DONT_CONSUME_CHARGE_IF_ITEM_DELETED: return 25;
case SPELL_ATTR9_ITEM_PASSIVE_ON_CLIENT: return 26;
case SPELL_ATTR9_FORCE_CORPSE_TARGET: return 27;
case SPELL_ATTR9_UNK28: return 28;
case SPELL_ATTR9_CANNOT_KILL_TARGET: return 28;
case SPELL_ATTR9_UNK29: return 29;
case SPELL_ATTR9_UNK30: return 30;
case SPELL_ATTR9_UNK31: return 31;