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

Code cleanup (#188)

Browse source
This commit is contained in:
Kamron Batman 2020-08-01 08:40:06 -07:00 • committed by GitHub
parent df53c16620
commit 010fd9402a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
185 changed files with 1052 additions and 1271 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Projects/UOContent/Mobiles/Animals/Mounts/Ethereals.cs
View file

@ -141,10 +141,7 @@ namespace Server.Mobiles
public void RemoveFollowers()
{
if (m_Rider != null)
m_Rider.Followers -= FollowerSlots;
if (m_Rider?.Followers < 0)
m_Rider.Followers = 0;
m_Rider.Followers -= Math.Min(m_Rider.Followers, FollowerSlots);
}
public void AddFollowers()
@ -161,7 +158,7 @@ namespace Server.Mobiles
return false;
}
if ((IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) || !BaseMount.CheckMountAllowed(from))
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this) || !BaseMount.CheckMountAllowed(from))
return false;
if (from.Mounted)

25
Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs
View file

@ -167,14 +167,8 @@ namespace Server.Mobiles
base.Deserialize(reader);
int version = reader.ReadInt();
if (version == 0)
Timer.DelayCall(TimeSpan.Zero, () => { Hue = GetHue(); });
if (version <= 1)
Timer.DelayCall(TimeSpan.Zero, () =>
{
if (InternalItem != null) InternalItem.Hue = Hue;
});
Timer.DelayCall(Fix, version);
if (version < 2)
for (int i = 0; i < Skills.Length; ++i)
@ -185,6 +179,23 @@ namespace Server.Mobiles
}
}
private void Fix(int version)
{
switch (version)
{
case 1:
{
if (InternalItem != null) InternalItem.Hue = Hue;
goto case 0;
}
case 0:
{
Hue = GetHue();
break;
}
}
}
private class ExpireTimer : Timer
{
private readonly Mobile m_Mobile;

25
Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs
View file

@ -184,14 +184,8 @@ namespace Server.Mobiles
base.Deserialize(reader);
int version = reader.ReadInt();
if (version == 0)
Timer.DelayCall(TimeSpan.Zero, () => Hue = GetHue());
if (version <= 1)
Timer.DelayCall(TimeSpan.Zero, () =>
{
if (InternalItem != null) InternalItem.Hue = Hue;
});
Timer.DelayCall(Fix, version);
if (version < 2)
for (int i = 0; i < Skills.Length; ++i)
@ -202,6 +196,23 @@ namespace Server.Mobiles
}
}
private void Fix(int version)
{
switch (version)
{
case 1:
{
if (InternalItem != null) InternalItem.Hue = Hue;
goto case 0;
}
case 0:
{
Hue = GetHue();
break;
}
}
}
private class ExpireTimer : Timer
{
private readonly Mobile m_Mobile;