diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-09-28 00:06:28 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-09-28 00:06:28 +0200 |
| commit | 13f22e0c06fcce0d76fba3530eff9a1c06c72674 (patch) | |
| tree | 8f4528b48efc601cca8a08219c881d915d919d58 /src/server/game/Entities | |
| parent | eac8411fe6b20a50092ac6115e65597da1b51e1e (diff) | |
Core/Misc: Reduce differences between branches
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Item/Item.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 7fa5ba63d37..5401c0c9c45 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -1421,12 +1421,10 @@ bool Item::HasEnchantRequiredSkill(Player const* player) const { // Check all enchants for required skill for (uint32 enchant_slot = PERM_ENCHANTMENT_SLOT; enchant_slot < MAX_ENCHANTMENT_SLOT; ++enchant_slot) - { if (uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot))) if (SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id)) if (enchantEntry->RequiredSkillID && player->GetSkillValue(enchantEntry->RequiredSkillID) < enchantEntry->RequiredSkillRank) return false; - } return true; } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 89bf5831d36..c8c75eb8279 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2316,7 +2316,7 @@ void Player::GiveLevel(uint8 level) UpdateAllStats(); - _ApplyAllLevelScaleItemMods(true); // Moved to above SetFullHealth so player will have full health from Heirlooms + _ApplyAllLevelScaleItemMods(true); if (Aura const* artifactAura = GetAura(ARTIFACTS_ALL_WEAPONS_GENERAL_WEAPON_EQUIPPED_PASSIVE)) if (Item* artifact = GetItemByGuid(artifactAura->GetCastItemGUID())) @@ -25983,7 +25983,7 @@ bool Player::isHonorOrXPTarget(Unit const* victim) const if (v_level < k_grey && !sWorld->getIntConfig(CONFIG_MIN_CREATURE_SCALED_XP_RATIO)) return false; - if (Creature const* const creature = victim->ToCreature()) + if (Creature const* creature = victim->ToCreature()) { if (creature->IsCritter() || creature->IsTotem()) return false; |