Cleanup & Fixes for .NET 5 (#309)

- [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

View file

@ -1,6 +1,6 @@
namespace Server.Items
{
public class DupresShield : BaseShield, ITokunoDyable
public class DupresShield : BaseShield
{
[Constructible]
public DupresShield() : base(0x2B01)

View file

@ -1,6 +1,6 @@
namespace Server.Items
{
public class OssianGrimoire : NecromancerSpellbook, ITokunoDyable
public class OssianGrimoire : NecromancerSpellbook
{
[Constructible]
public OssianGrimoire()

View file

@ -1,6 +1,6 @@
namespace Server.Items
{
public class QuiverOfInfinity : BaseQuiver, ITokunoDyable
public class QuiverOfInfinity : BaseQuiver
{
[Constructible]
public QuiverOfInfinity() : base(0x2B02)

View file

@ -12,7 +12,7 @@ namespace Server.Items
Reptalon = 1075202
}
public class BaseFormTalisman : Item, ITokunoDyable
public class BaseFormTalisman : Item
{
public BaseFormTalisman() : base(0x2F59)
{

View file

@ -2,8 +2,7 @@ using Server.Engines.Craft;
namespace Server.Items
{
[Anvil]
[Flippable(0xFAF, 0xFB0)]
[Anvil, Flippable(0xFAF, 0xFB0)]
public class ColoredAnvil : Item
{
[Constructible]

View file

@ -1,6 +1,6 @@
namespace Server.Items
{
public class JesterHatofChuckles : BaseHat, ITokunoDyable
public class JesterHatofChuckles : BaseHat
{
[Constructible]
public JesterHatofChuckles() : this(Utility.RandomList(0x13e, 0x03, 0x172, 0x3f))

View file

@ -114,7 +114,7 @@ namespace Server.Items
var location = Location;
location.Z += 10;
Effects.SendLocationEffect(location, Map, 0x3709, 10, 10, 0x356, 0);
Effects.SendLocationEffect(location, Map, 0x3709, 10, 10, 0x356);
Effects.PlaySound(location, Map, 0x32E);
if (Items.Count > 0)

View file

@ -2,10 +2,6 @@
namespace Server.Items
{
public interface ITokunoDyable
{
}
public class HeritageToken : Item
{
[Constructible]

View file

@ -1,7 +1,6 @@
namespace Server.Items
{
[Furniture]
[Flippable(0x232A, 0x232B)]
[Furniture, Flippable(0x232A, 0x232B)]
public class GiftBox : BaseContainer
{
[Constructible]

View file

@ -1,6 +1,6 @@
namespace Server.Items
{
public class GiftBoxHues
public static class GiftBoxHues
{
/* there's possibly a couple more, but this is what we could verify on OSI */

View file

@ -1,7 +1,6 @@
namespace Server.Items
{
[Furniture]
[Flippable(0x2bd9, 0x2bda)]
[Furniture, Flippable(0x2bd9, 0x2bda)]
public class GreenStocking : BaseContainer
{
[Constructible]
@ -29,8 +28,7 @@ namespace Server.Items
}
}
[Furniture]
[Flippable(0x2bdb, 0x2bdc)]
[Furniture, Flippable(0x2bdb, 0x2bdc)]
public class RedStocking : BaseContainer
{
[Constructible]

View file

@ -1,3 +1,4 @@
using System;
using Server.Engines.VeteranRewards;
using Server.Gumps;
using Server.Multis;
@ -82,7 +83,7 @@ namespace Server.Items
/* Efreet */ new MonsterStatuetteInfo(1080521, 0x2590, 0x300),
/* Slime */ new MonsterStatuetteInfo(1015246, 0x20E8, 456),
/* PlagueBeast */ new MonsterStatuetteInfo(1029747, 0x2613, 0x1BF),
/* RedDeath */ new MonsterStatuetteInfo(1094932, 0x2617, new int[] { }),
/* RedDeath */ new MonsterStatuetteInfo(1094932, 0x2617, Array.Empty<int>()),
/* Spider */ new MonsterStatuetteInfo(1029668, 0x25C4, 1170),
/* OphidianArchMage */ new MonsterStatuetteInfo(1029641, 0x25A9, 639),
/* OphidianWarrior */ new MonsterStatuetteInfo(1029645, 0x25AD, 634),

View file

@ -2,7 +2,7 @@ using Server.Network;
namespace Server
{
public class MessageHelper
public static class MessageHelper
{
public static void SendLocalizedMessageTo(Item from, Mobile to, int number, int hue)
{