diff options
| author | pete318 <pete318@hotmail.com> | 2015-02-23 10:52:07 +0000 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2015-06-04 13:35:05 +0200 |
| commit | f9cba93985d79ae352a9e6371da1d580a119fb51 (patch) | |
| tree | 3a5d7d133d168289627869583afa3a47b4bd07d4 /src | |
| parent | 239f0b4ad0e83da9d31c8031aa2e50c294bfc913 (diff) | |
Core/Spells: Support for targetting spells onto in flight units
* This adds support to spell_custom_attr to allow a spell to be cast
upon a unit on a taxi/in flight.
* This will allow the Issue #11880 with Horde quest Test At Sea (11170) to be corrected.
* closes #14235
Signed-off-by: Naios <naios-dev@live.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 75a48e36ded..789b95e3e14 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1614,7 +1614,7 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta } // not allow casting on flying player - if (unitTarget->HasUnitState(UNIT_STATE_IN_FLIGHT)) + if (unitTarget->HasUnitState(UNIT_STATE_IN_FLIGHT) && !(AttributesCu & SPELL_ATTR0_CU_ALLOW_INFLIGHT_TARGET)) return SPELL_FAILED_BAD_TARGETS; /* TARGET_UNIT_MASTER gets blocked here for passengers, because the whole idea of this check is to diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index f2808a089e1..cfa9877405d 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -186,6 +186,7 @@ enum SpellCustomAttributes SPELL_ATTR0_CU_IGNORE_ARMOR = 0x00008000, SPELL_ATTR0_CU_REQ_TARGET_FACING_CASTER = 0x00010000, SPELL_ATTR0_CU_REQ_CASTER_BEHIND_TARGET = 0x00020000, + SPELL_ATTR0_CU_ALLOW_INFLIGHT_TARGET = 0x00040000, SPELL_ATTR0_CU_NEGATIVE = SPELL_ATTR0_CU_NEGATIVE_EFF0 | SPELL_ATTR0_CU_NEGATIVE_EFF1 | SPELL_ATTR0_CU_NEGATIVE_EFF2 }; |