From 28040582bcbefc247bc7b21b3e733194bc70914f Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sat, 22 Oct 2022 09:56:52 -0700
Subject: [PATCH] fix: Fixes skill mods NPE with Skills (#1200)

---
 Projects/Server/Skills.cs | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/Projects/Server/Skills.cs b/Projects/Server/Skills.cs
index c0a931e86..671e8ca35 100644
--- a/Projects/Server/Skills.cs
+++ b/Projects/Server/Skills.cs
@@ -271,34 +271,37 @@ public class Skill
 
             Owner.Owner.ValidateSkillMods();
 
-            var mods = Owner.Owner.SkillMods;
-
             double bonusObey = 0.0, bonusNotObey = 0.0;
 
-            foreach (var mod in mods)
-            {
-                if (mod.Skill != (SkillName)Info.SkillID)
-                {
-                    continue;
-                }
+            var mods = Owner.Owner.SkillMods;
 
-                if (mod.Relative)
+            if (mods != null)
+            {
+                foreach (var mod in mods)
                 {
-                    if (mod.ObeyCap)
+                    if (mod.Skill != (SkillName)Info.SkillID)
                     {
-                        bonusObey += mod.Value;
+                        continue;
+                    }
+
+                    if (mod.Relative)
+                    {
+                        if (mod.ObeyCap)
+                        {
+                            bonusObey += mod.Value;
+                        }
+                        else
+                        {
+                            bonusNotObey += mod.Value;
+                        }
                     }
                     else
                     {
-                        bonusNotObey += mod.Value;
+                        bonusObey = 0.0;
+                        bonusNotObey = 0.0;
+                        value = mod.Value;
                     }
                 }
-                else
-                {
-                    bonusObey = 0.0;
-                    bonusNotObey = 0.0;
-                    value = mod.Value;
-                }
             }
 
             value += bonusNotObey;