warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Fixes skill mods NPE with Skills (#1200)

Browse source
This commit is contained in:
Kamron Batman 2022-10-22 09:56:52 -07:00 • committed by GitHub
parent c711e7ab02
commit 28040582bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Projects/Server/Skills.cs
View file

@ -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;