Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-05-26 23:00:39 +08:00
78 changed files with 102236 additions and 327 deletions

View File

@@ -6586,6 +6586,8 @@ void Player::_ApplyItemBonuses(ItemTemplate const* proto, uint8 slot, bool apply
statType = proto->ItemStat[i].ItemStatType;
val = proto->ItemStat[i].ItemStatValue;
sScriptMgr->OnApplyItemModsBefore(this, slot, apply, i, statType, val);
}
if (val == 0)

View File

@@ -4451,6 +4451,8 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool
}
}
sScriptMgr->OnApplyEnchantmentItemModsBefore(this, item, slot, apply, enchant_spell_id, enchant_amount);
LOG_DEBUG("entities.player.items", "Adding {} to stat nb {}", enchant_amount, enchant_spell_id);
switch (enchant_spell_id)
{

View File

@@ -19312,7 +19312,7 @@ float Unit::MeleeSpellMissChance(Unit const* victim, WeaponAttackType attType, i
modOwner->ApplySpellMod(spellId, SPELLMOD_RESIST_MISS_CHANCE, hitChance);
}
missChance += hitChance - 100.0f;
missChance -= hitChance - 100.0f;
if (attType == RANGED_ATTACK)
missChance -= m_modRangedHitChance;