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

4
Projects/UOContent/Commands/Generic/Implementors/ContainedCommandImplementor.cs
View file

@ -21,7 +21,7 @@ namespace Server.Commands.Generic
{
if (command.ValidateArgs(this, new CommandEventArgs(from, command.Commands[0], GenerateArgString(args), args)))
from.BeginTarget(-1, command.ObjectTypes == ObjectTypes.All, TargetFlags.None,
(m, targeted) => OnTarget(m, targeted, command, args));
(m, targeted, a) => OnTarget(m, targeted, command, a), args);
}
public void OnTarget(Mobile from, object targeted, BaseCommand command, string[] args)
@ -70,4 +70,4 @@ namespace Server.Commands.Generic
}
}
}
}
}

8
Projects/UOContent/Commands/Generic/Implementors/MultiCommandImplementor.cs
View file

@ -17,7 +17,7 @@ namespace Server.Commands.Generic
{
if (command.ValidateArgs(this, new CommandEventArgs(from, command.Commands[0], GenerateArgString(args), args)))
from.BeginTarget(-1, command.ObjectTypes == ObjectTypes.All, TargetFlags.None,
(m, targeted) => OnTarget(m, targeted, command, args));
(m, targeted, a) => OnTarget(m, targeted, command, a), args);
}
public void OnTarget(Mobile from, object targeted, BaseCommand command, string[] args)
@ -26,7 +26,7 @@ namespace Server.Commands.Generic
{
from.SendLocalizedMessage(500447); // That is not accessible.
from.BeginTarget(-1, command.ObjectTypes == ObjectTypes.All, TargetFlags.None,
(m, t) => OnTarget(m, t, command, args));
(m, t, a) => OnTarget(m, t, command, a), args);
return;
}
@ -67,7 +67,7 @@ namespace Server.Commands.Generic
RunCommand(from, targeted, command, args);
from.BeginTarget(-1, command.ObjectTypes == ObjectTypes.All, TargetFlags.None,
(m, t) => OnTarget(m, t, command, args));
(m, t, a) => OnTarget(m, t, command, a), args);
}
}
}
}

4
Projects/UOContent/Commands/Generic/Implementors/SingleCommandImplementor.cs
View file

@ -38,7 +38,7 @@ namespace Server.Commands.Generic
{
if (command.ValidateArgs(this, new CommandEventArgs(from, command.Commands[0], GenerateArgString(args), args)))
from.BeginTarget(-1, command.ObjectTypes == ObjectTypes.All, TargetFlags.None,
(m, targeted) => OnTarget(m, targeted, command, args));
(m, targeted, a) => OnTarget(m, targeted, command, a), args);
}
public void OnTarget(Mobile from, object targeted, BaseCommand command, string[] args)
@ -86,4 +86,4 @@ namespace Server.Commands.Generic
RunCommand(from, targeted, command, args);
}
}
}
}

7
Projects/UOContent/Commands/Object Creation/CategorizedAddGump.cs
View file

@ -91,12 +91,7 @@ namespace Server.Gumps
CAGNode[] nodes = m_Category.Nodes;
int count = nodes.Length - page * EntryCount;
if (count < 0)
count = 0;
else if (count > EntryCount)
count = EntryCount;
int count = Math.Clamp(nodes.Length - page * EntryCount, 0, EntryCount);
int totalHeight = OffsetSize + (EntryHeight + OffsetSize) * (count + 1);

6
Projects/UOContent/Commands/Properties.cs
View file

@ -196,7 +196,7 @@ namespace Server.Commands
}
}
return chain[chain.Length - 1];
return chain[^1];
}
public static string GetValue(Mobile from, object o, string name)
@ -328,7 +328,7 @@ namespace Server.Commands
concat[i * 2 + 1] = i < chain.Length - 1 ? "." : " = ";
}
concat[concat.Length - 1] = toString;
concat[^1] = toString;
return string.Concat(concat);
}
@ -654,7 +654,7 @@ namespace Server
if (!IsBound)
throw new NotYetBoundException(this);
return m_Chain[m_Chain.Length - 1].PropertyType;
return m_Chain[^1].PropertyType;
}
}