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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Scripts/Skills/AnimalTaming.cs
View file

@ -44,8 +44,7 @@ namespace Server.SkillHandlers
public static bool MustBeSubdued(BaseCreature bc)
{
if (bc.Owners.Count > 0) return false;
return bc.SubdueBeforeTame && bc.Hits > bc.HitsMax / 10;
return bc.Owners.Count <= 0 && bc.SubdueBeforeTame && bc.Hits > bc.HitsMax / 10;
}
public static void ScaleStats(BaseCreature bc, double scalar)
@ -316,7 +315,7 @@ namespace Server.SkillHandlers
m_Tamer.NetState); // You must subdue this creature before you can tame it!
Stop();
}
else if (de != null && de.LastDamage > m_StartTime)
else if (de?.LastDamage > m_StartTime)
{
m_BeingTamed.Remove(m_Creature);
m_Tamer.NextSkillTime = Core.TickCount;
@ -418,14 +417,8 @@ namespace Server.SkillHandlers
{
IPoint3D p = m_Tamer;
if (p == null)
return false;
if (m_Creature.InRange(new Point3D(p), 1))
return true;
MovementPath path = new MovementPath(m_Creature, new Point3D(p));
return path.Success;
return p != null && (m_Creature.InRange(new Point3D(p), 1) ||
new MovementPath(m_Creature, new Point3D(p)).Success);
}
}
}