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

Cleanup & Fixes for .NET 5 (#309)

Browse source 
- [X] Fixes several bugs
- [X] Updates more ordinal issues
- [X] Cleans up the code a bit
- [X] Turns classes static that should have been
- [X] Changes TcpServer.Instances to a HashSet

Bumps release version
This commit is contained in:
Kamron Batman 2020-11-15 10:03:50 -08:00 • committed by GitHub
parent 4ad8811df2
commit 525cda5413
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
266 changed files with 1348 additions and 1800 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs
View file

@ -76,7 +76,7 @@ namespace Server.Items
ClearComponents(addon);
flipMethod.Invoke(addon, new object[2] { from, Directions[index] });
flipMethod.Invoke(addon, new object[] { from, Directions[index] });
if (result == AddonFitResult.Blocked)
{

5
Projects/UOContent/Items/Misc/FlippableAttribute.cs
View file

@ -3,15 +3,14 @@ using Server.Targeting;
namespace Server.Items
{
public class FlipCommandHandlers
public static class FlipCommandHandlers
{
public static void Initialize()
{
CommandSystem.Register("Flip", AccessLevel.GameMaster, Flip_OnCommand);
}
[Usage("Flip")]
[Description("Turns an item.")]
[Usage("Flip"), Description("Turns an item.")]
public static void Flip_OnCommand(CommandEventArgs e)
{
e.Mobile.Target = new FlipTarget();

3
Projects/UOContent/Items/Misc/PublicMoongate.cs
View file

@ -114,8 +114,7 @@ namespace Server.Items
CommandSystem.Register("MoonGen", AccessLevel.Administrator, MoonGen_OnCommand);
}
[Usage("MoonGen")]
[Description("Generates public moongates. Removes all old moongates.")]
[Usage("MoonGen"), Description("Generates public moongates. Removes all old moongates.")]
public static void MoonGen_OnCommand(CommandEventArgs e)
{
DeleteAll();

6
Projects/UOContent/Items/Misc/Teleporter.cs
View file

@ -260,14 +260,14 @@ namespace Server.Items
if (m_SourceEffect && sendEffect)
{
Effects.SendLocationEffect(m.Location, m.Map, 0x3728, 10, 10);
Effects.SendLocationEffect(m.Location, m.Map, 0x3728, 10);
}
m.MoveToWorld(p, map);
if (m_DestEffect && sendEffect)
{
Effects.SendLocationEffect(m.Location, m.Map, 0x3728, 10, 10);
Effects.SendLocationEffect(m.Location, m.Map, 0x3728, 10);
}
if (m_SoundID > 0 && sendEffect)
@ -598,7 +598,7 @@ namespace Server.Items
{
isMatch = true;
}
else if (m_Substring != null && e.Speech.ToLower().IndexOf(m_Substring.ToLower(), StringComparison.Ordinal) >= 0)
else if (m_Substring != null && e.Speech.ToLower().Contains(m_Substring.ToLower(), StringComparison.Ordinal))
{
isMatch = true;
}

2
Projects/UOContent/Items/Misc/UnholyBone.cs
View file

@ -26,7 +26,7 @@ namespace Server.Items
public void Carve(Mobile from, Item item)
{
Effects.PlaySound(GetWorldLocation(), Map, 0x48F);
Effects.SendLocationEffect(GetWorldLocation(), Map, 0x3728, 10, 10, 0, 0);
Effects.SendLocationEffect(GetWorldLocation(), Map, 0x3728, 10);
if (Utility.RandomDouble() < 0.3)
{