diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-03-12 17:48:07 -0300 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2020-04-24 17:18:47 +0200 |
| commit | a098b454b8292839ae246735cf27340b1080f190 (patch) | |
| tree | 0b1f8232aa46a5d91bb1f850a509febb2d090356 /src/server/game/Entities/Unit | |
| parent | f793a43cee6966fcb26c8b42ec63f35c2c351fd8 (diff) | |
Core/Entities: virtualize CheckAttackFitToAuraRequirement
- Should've been like this to begin with
(cherry picked from commit 21d95a1d767c95910d4508e0e83f34b4f89f587a)
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 17 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 3 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index be6324229d8..8de9a90ac44 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9568,23 +9568,6 @@ void Unit::UpdateUnitMod(UnitMods unitMod) } } -bool Unit::CheckAttackFitToAuraRequirement(WeaponAttackType attackType, AuraEffect const* aurEff) const -{ - // only players have item requirements - if (GetTypeId() != TYPEID_PLAYER) - return true; - - SpellInfo const* spellInfo = aurEff->GetSpellInfo(); - if (spellInfo->EquippedItemClass == -1) - return true; - - Item* item = ToPlayer()->GetWeaponForAttack(attackType, true); - if (!item || !item->IsFitToSpellRequirements(spellInfo)) - return false; - - return true; -} - void Unit::UpdateDamageDoneMods(WeaponAttackType attackType) { UnitMods unitMod; diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 0838d2b226b..32e109a5392 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1700,7 +1700,8 @@ class TC_GAME_API Unit : public WorldObject void UpdateUnitMod(UnitMods unitMod); - bool CheckAttackFitToAuraRequirement(WeaponAttackType attackType, AuraEffect const* aurEff) const; + // only players have item requirements + virtual bool CheckAttackFitToAuraRequirement(WeaponAttackType /*attackType*/, AuraEffect const* /*aurEff*/) const { return true; } virtual void UpdateDamageDoneMods(WeaponAttackType attackType); void UpdateAllDamageDoneMods(); |
