aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Player
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-04-28 18:31:26 +0200
committerShauren <shauren.trinity@gmail.com>2022-04-28 18:31:26 +0200
commitdda375b9868d6dbe2a4d58b386bb90ae41d25e0d (patch)
tree9a4a55dd37d787b1384ed55ba99be0cc92cfa2e2 /src/server/game/Entities/Player
parentc88b602a2c7eda598a4205dd0ec9f562c31f21b0 (diff)
Core/Spells: Rename SpellAttr2 to use official attribute names
* Corrected implementation of SPELL_ATTR1_ALLOW_WHILE_STEALTHED * Implemented SPELL_ATTR2_RETAIN_ITEM_CAST * Implemented SPELL_ATTR2_ALLOW_WHILE_INVISIBLE * Implemented SPELL_ATTR0_PROC_FAILURE_BURNS_CHARGE * Implemented SPELL_ATTR2_PROC_COOLDOWN_ON_FAILURE * Implemented SPELL_ATTR2_NO_TARGET_PER_SECOND_COSTS * Implemented SPELL_ATTR2_DO_NOT_REPORT_SPELL_FAILURE * Implemented SPELL_ATTR1_REQUIRE_ALL_TARGETS * Implemented SPELL_ATTR2_CHAIN_FROM_CASTER * Implemented SPELL_ATTR2_NO_ACTIVE_PETS * Implemented SPELL_ATTR2_ENCHANT_OWN_ITEM_ONLY
Diffstat (limited to 'src/server/game/Entities/Player')
-rw-r--r--src/server/game/Entities/Player/Player.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 3e5f86cbbca..aa8d4f693bf 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -3132,7 +3132,7 @@ bool Player::HandlePassiveSpellLearn(SpellInfo const* spellInfo)
// talent dependent passives activated at form apply have proper stance data
ShapeshiftForm form = GetShapeshiftForm();
bool need_cast = (!spellInfo->Stances || (form && (spellInfo->Stances & (UI64LIT(1) << (form - 1)))) ||
- (!form && (spellInfo->HasAttribute(SPELL_ATTR2_NOT_NEED_SHAPESHIFT))));
+ (!form && (spellInfo->HasAttribute(SPELL_ATTR2_ALLOW_WHILE_NOT_SHAPESHIFTED_CASTER_FORM))));
// Check EquippedItemClass
// passive spells which apply aura and have an item requirement are to be added manually, instead of casted
@@ -5465,7 +5465,7 @@ bool Player::UpdateCraftSkill(SpellInfo const* spellInfo)
uint32 SkillValue = GetPureSkillValue(_spell_idx->second->SkillupSkillLineID);
// Alchemy Discoveries here
- if (spellInfo && spellInfo->Mechanic == MECHANIC_DISCOVERY)
+ if (spellInfo->Mechanic == MECHANIC_DISCOVERY)
{
if (uint32 discoveredSpell = GetSkillDiscoverySpell(_spell_idx->second->SkillupSkillLineID, spellInfo->Id, this))
LearnSpell(discoveredSpell, false);
@@ -24758,7 +24758,7 @@ void Player::ApplyEquipCooldown(Item* pItem)
continue;
if (Aura* itemAura = GetAura(effectData->SpellID, GetGUID(), pItem->GetGUID()))
- itemAura->AddProcCooldown(now + procEntry->Cooldown);
+ itemAura->AddProcCooldown(procEntry, now);
continue;
}