From 28faf4346fefb2153910099fe1b2fca6b0e523d9 Mon Sep 17 00:00:00 2001
From: SpeedyDevil <38978615+SpeedyDevil@users.noreply.github.com>
Date: Sun, 29 Aug 2021 19:04:59 +0200
Subject: [PATCH] fix: Fixes damage types when wearing quivers (#747)

---
 .../UOContent/Items/Weapons/BaseWeapon.cs     | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
index 654a0315b..b7f794833 100644
--- a/Projects/UOContent/Items/Weapons/BaseWeapon.cs
+++ b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
@@ -1838,23 +1838,21 @@ namespace Server.Items
             AddBlood(attacker, defender, damage);
             int phys, fire, cold, pois, nrgy, chaos, direct;
 
+            GetDamageTypes(
+                   attacker,
+                   out phys,
+                   out fire,
+                   out cold,
+                   out pois,
+                   out nrgy,
+                   out chaos,
+                   out direct
+               );
+
             if (Core.ML && this is BaseRanged && attacker.FindItemOnLayer(Layer.Cloak) is BaseQuiver quiver)
             {
                 quiver.AlterBowDamage(out phys, out fire, out cold, out pois, out nrgy, out chaos, out direct);
             }
-            else
-            {
-                GetDamageTypes(
-                    attacker,
-                    out phys,
-                    out fire,
-                    out cold,
-                    out pois,
-                    out nrgy,
-                    out chaos,
-                    out direct
-                );
-            }
 
             if (Consecrated)
             {