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

11
Scripts/Mobiles/Animals/Mounts/BaseMount.cs
View file

@ -111,19 +111,16 @@ namespace Server.Mobiles
if (m_Rider == null)
return;
Mobile attacker = from;
if (attacker == null)
attacker = m_Rider.FindMostRecentDamager(true);
Mobile attacker = from ?? m_Rider.FindMostRecentDamager(true);
if (!(attacker == this || attacker == m_Rider || willKill || DateTime.UtcNow < NextMountAbility))
if (DoMountAbility(amount, from))
if (!(attacker == this || attacker == m_Rider || willKill || DateTime.UtcNow < NextMountAbility)
&& DoMountAbility(amount, from))
NextMountAbility = DateTime.UtcNow + MountAbilityDelay;
}
public override bool OnBeforeDeath()
{
Rider = null;
return base.OnBeforeDeath();
}
@ -351,4 +348,4 @@ namespace Server.Mobiles
}
}
}
}
}