Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Player: only call _ApplyWeaponDamage for actual weapons

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/905112b2a61c5b3999f936d957e10a3ee6258751)
This commit is contained in:
hondacrx
2021-06-23 14:42:03 -04:00
parent a34469c171
commit e8b7f00161
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Combat.cs
+5 -8
View File
@@ -291,17 +291,14 @@ namespace Game.Entities
return true; return true;
} }
public void _ApplyWeaponDamage(uint slot, Item item, bool apply) public void _ApplyWeaponDamage(byte slot, Item item, bool apply)
{ {
ItemTemplate proto = item.GetTemplate(); ItemTemplate proto = item.GetTemplate();
WeaponAttackType attType = WeaponAttackType.BaseAttack; WeaponAttackType attType = GetAttackBySlot(slot, proto.GetInventoryType());
if (attType == WeaponAttackType.Max)
return;
float damage = 0.0f; float damage = 0.0f;
if (slot == EquipmentSlot.MainHand && (proto.GetInventoryType() == InventoryType.Ranged || proto.GetInventoryType() == InventoryType.RangedRight))
attType = WeaponAttackType.RangedAttack;
else if (slot == EquipmentSlot.OffHand)
attType = WeaponAttackType.OffAttack;
uint itemLevel = item.GetItemLevel(this); uint itemLevel = item.GetItemLevel(this);
float minDamage, maxDamage; float minDamage, maxDamage;
proto.GetDamage(itemLevel, out minDamage, out maxDamage); proto.GetDamage(itemLevel, out minDamage, out maxDamage);
Source/Game/Spells/Auras/AuraEffect.cs
+3 -3
View File
@@ -1702,7 +1702,7 @@ namespace Game.Spells
Action<Unit> flagAddFn = null; Action<Unit> flagAddFn = null;
Action<Unit> flagRemoveFn = null; Action<Unit> flagRemoveFn = null;
uint slot; byte slot;
WeaponAttackType attType; WeaponAttackType attType;
switch (type) switch (type)
{ {
@@ -1742,10 +1742,10 @@ namespace Game.Spells
{ {
Player player = target.ToPlayer(); Player player = target.ToPlayer();
Item item = player.GetItemByPos(InventorySlots.Bag0, (byte)slot); Item item = player.GetItemByPos(InventorySlots.Bag0, slot);
if (item != null) if (item != null)
{ {
WeaponAttackType attackType = Player.GetAttackBySlot((byte)slot, item.GetTemplate().GetInventoryType()); WeaponAttackType attackType = Player.GetAttackBySlot(slot, item.GetTemplate().GetInventoryType());
player.ApplyItemDependentAuras(item, !apply); player.ApplyItemDependentAuras(item, !apply);
if (attackType < WeaponAttackType.Max) if (attackType < WeaponAttackType.Max)