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

14
Projects/UOContent/Items/Construction/Ankhs.cs
View file

@ -5,7 +5,7 @@ using Server.Mobiles;
namespace Server.Items
{
public class Ankhs
public static class Ankhs
{
public const int ResurrectRange = 2;
public const int TitheRange = 2;
@ -130,8 +130,7 @@ namespace Server.Items
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
[Hue]
[CommandProperty(AccessLevel.GameMaster)]
[Hue, CommandProperty(AccessLevel.GameMaster)]
public override int Hue
{
get => base.Hue;
@ -222,8 +221,7 @@ namespace Server.Items
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
[Hue]
[CommandProperty(AccessLevel.GameMaster)]
[Hue, CommandProperty(AccessLevel.GameMaster)]
public override int Hue
{
get => base.Hue;
@ -319,8 +317,7 @@ namespace Server.Items
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
[Hue]
[CommandProperty(AccessLevel.GameMaster)]
[Hue, CommandProperty(AccessLevel.GameMaster)]
public override int Hue
{
get => base.Hue;
@ -413,8 +410,7 @@ namespace Server.Items
public override bool HandlesOnMovement => true; // Tell the core that we implement OnMovement
[Hue]
[CommandProperty(AccessLevel.GameMaster)]
[Hue, CommandProperty(AccessLevel.GameMaster)]
public override int Hue
{
get => base.Hue;

3
Projects/UOContent/Items/Construction/Chairs/Benchs.cs
View file

@ -1,7 +1,6 @@
namespace Server.Items
{
[Furniture]
[Flippable(0xB2D, 0xB2C)]
[Furniture, Flippable(0xB2D, 0xB2C)]
public class WoodenBench : Item
{
[Constructible]

24
Projects/UOContent/Items/Construction/Chairs/Chairs.cs
View file

@ -1,7 +1,6 @@
namespace Server.Items
{
[Furniture]
[Flippable(0xB4F, 0xB4E, 0xB50, 0xB51)]
[Furniture, Flippable(0xB4F, 0xB4E, 0xB50, 0xB51)]
public class FancyWoodenChairCushion : Item
{
[Constructible]
@ -31,8 +30,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0xB53, 0xB52, 0xB54, 0xB55)]
[Furniture, Flippable(0xB53, 0xB52, 0xB54, 0xB55)]
public class WoodenChairCushion : Item
{
[Constructible]
@ -62,8 +60,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0xB57, 0xB56, 0xB59, 0xB58)]
[Furniture, Flippable(0xB57, 0xB56, 0xB59, 0xB58)]
public class WoodenChair : Item
{
[Constructible]
@ -93,8 +90,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0xB5B, 0xB5A, 0xB5C, 0xB5D)]
[Furniture, Flippable(0xB5B, 0xB5A, 0xB5C, 0xB5D)]
public class BambooChair : Item
{
[Constructible]
@ -124,8 +120,7 @@ namespace Server.Items
}
}
[DynamicFliping]
[Flippable(0x1218, 0x1219, 0x121A, 0x121B)]
[DynamicFliping, Flippable(0x1218, 0x1219, 0x121A, 0x121B)]
public class StoneChair : Item
{
[Constructible]
@ -150,8 +145,7 @@ namespace Server.Items
}
}
[DynamicFliping]
[Flippable(0x2DE3, 0x2DE4, 0x2DE5, 0x2DE6)]
[DynamicFliping, Flippable(0x2DE3, 0x2DE4, 0x2DE5, 0x2DE6)]
public class OrnateElvenChair : Item
{
[Constructible]
@ -176,8 +170,7 @@ namespace Server.Items
}
}
[DynamicFliping]
[Flippable(0x2DEB, 0x2DEC, 0x2DED, 0x2DEE)]
[DynamicFliping, Flippable(0x2DEB, 0x2DEC, 0x2DED, 0x2DEE)]
public class BigElvenChair : Item
{
[Constructible]
@ -204,8 +197,7 @@ namespace Server.Items
}
}
[DynamicFliping]
[Flippable(0x2DF5, 0x2DF6)]
[DynamicFliping, Flippable(0x2DF5, 0x2DF6)]
public class ElvenReadingChair : Item
{
[Constructible]

6
Projects/UOContent/Items/Construction/Chairs/Thrones.cs
View file

@ -1,7 +1,6 @@
namespace Server.Items
{
[Furniture]
[Flippable(0xB32, 0xB33)]
[Furniture, Flippable(0xB32, 0xB33)]
public class Throne : Item
{
[Constructible]
@ -31,8 +30,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0xB2E, 0xB2F, 0xB31, 0xB30)]
[Furniture, Flippable(0xB2E, 0xB2F, 0xB31, 0xB30)]
public class WoodenThrone : Item
{
[Constructible]

6
Projects/UOContent/Items/Construction/Doors/BaseDoor.cs
View file

@ -135,8 +135,7 @@ namespace Server.Items
CommandSystem.Register("ChainLink", AccessLevel.GameMaster, ChainLink_OnCommand);
}
[Usage("Link")]
[Description("Links two targeted doors together.")]
[Usage("Link"), Description("Links two targeted doors together.")]
private static void Link_OnCommand(CommandEventArgs e)
{
e.Mobile.BeginTarget(-1, false, TargetFlags.None, Link_OnFirstTarget);
@ -172,8 +171,7 @@ namespace Server.Items
}
}
[Usage("ChainLink")]
[Description("Chain-links two or more targeted doors together.")]
[Usage("ChainLink"), Description("Chain-links two or more targeted doors together.")]
private static void ChainLink_OnCommand(CommandEventArgs e)
{
e.Mobile.BeginTarget(-1, false, TargetFlags.None, ChainLink_OnTarget, new List<BaseDoor>());

3
Projects/UOContent/Items/Construction/Misc/Easel.cs
View file

@ -1,7 +1,6 @@
namespace Server.Items
{
[Furniture]
[Flippable(0xF65, 0xF67, 0xF69)]
[Furniture, Flippable(0xF65, 0xF67, 0xF69)]
public class Easel : Item
{
[Constructible]

6
Projects/UOContent/Items/Construction/Misc/MusicStand.cs
View file

@ -1,7 +1,6 @@
namespace Server.Items
{
[Furniture]
[Flippable(0xEBB, 0xEBC)]
[Furniture, Flippable(0xEBB, 0xEBC)]
public class TallMusicStand : Item
{
[Constructible]
@ -31,8 +30,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0xEB6, 0xEB8)]
[Furniture, Flippable(0xEB6, 0xEB8)]
public class ShortMusicStand : Item
{
[Constructible]

6
Projects/UOContent/Items/Construction/Misc/Screens.cs
View file

@ -1,7 +1,6 @@
namespace Server.Items
{
[Furniture]
[Flippable(0x24D0, 0x24D1, 0x24D2, 0x24D3, 0x24D4)]
[Furniture, Flippable(0x24D0, 0x24D1, 0x24D2, 0x24D3, 0x24D4)]
public class BambooScreen : Item
{
[Constructible]
@ -26,8 +25,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0x24CB, 0x24CC, 0x24CD, 0x24CE, 0x24CF)]
[Furniture, Flippable(0x24CB, 0x24CC, 0x24CD, 0x24CE, 0x24CF)]
public class ShojiScreen : Item
{
[Constructible]

9
Projects/UOContent/Items/Construction/Tables/Tables.cs
View file

@ -50,8 +50,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0xB90, 0xB7D)]
[Furniture, Flippable(0xB90, 0xB7D)]
public class LargeTable : Item
{
[Constructible]
@ -81,8 +80,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0xB35, 0xB34)]
[Furniture, Flippable(0xB35, 0xB34)]
public class Nightstand : Item
{
[Constructible]
@ -112,8 +110,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0xB8F, 0xB7C)]
[Furniture, Flippable(0xB8F, 0xB7C)]
public class YewWoodTable : Item
{
[Constructible]

3
Projects/UOContent/Items/Construction/Tables/WritingTable.cs
View file

@ -1,7 +1,6 @@
namespace Server.Items
{
[Furniture]
[Flippable(0xB4A, 0xB49, 0xB4B, 0xB4C)]
[Furniture, Flippable(0xB4A, 0xB49, 0xB4B, 0xB4C)]
public class WritingTable : Item
{
[Constructible]