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

fix(core): Removes implicit cast between Serial and uint (#728)

Browse source 
* Fixes spellbooks using serial ctor
* Fixes misc items where someone thought they had an amount and it didn't
* Fixes all `Food` types.
This commit is contained in:
Kamron Batman 2021-08-25 00:27:19 -07:00 • committed by GitHub
parent 17521c9cd7
commit 0dc4acc164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 319 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server.Tests/Helpers/PacketWriter.cs
View file

@ -137,6 +137,8 @@ namespace Server.Network
UnderlyingStream.Write(m_Buffer, 0, 4);
}
public void Write(Serial serial) => Write(serial.Value);
/// <summary>
/// Writes a sequence of bytes to the underlying stream
/// </summary>

14
Projects/Server.Tests/Tests/Network/Packets/Outgoing/AccountPacketTests.cs
View file

@ -35,11 +35,11 @@ namespace Server.Tests.Network
[Fact]
public void TestChangeCharacter()
{
var firstMobile = new Mobile(0x1);
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.RawName = "Test Mobile";
var secondMobile = new Mobile(0x2);
var secondMobile = new Mobile((Serial)0x2);
secondMobile.DefaultMobileInit();
secondMobile.RawName = null;
@ -98,7 +98,7 @@ namespace Server.Tests.Network
[Theory, InlineData(ProtocolChanges.Version70610), InlineData(ProtocolChanges.Version6000)]
public void TestSupportedFeatures(ProtocolChanges protocolChanges)
{
var firstMobile = new Mobile(0x1);
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.Name = "Test Mobile";
@ -123,7 +123,7 @@ namespace Server.Tests.Network
[Fact]
public void TestLoginConfirm()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Body = 0x100;
m.X = 100;
@ -156,7 +156,7 @@ namespace Server.Tests.Network
[Fact]
public void TestCharacterListUpdate()
{
var firstMobile = new Mobile(0x1);
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.RawName = "Test Mobile";
@ -179,7 +179,7 @@ namespace Server.Tests.Network
[Fact]
public void TestCharacterList70130()
{
var firstMobile = new Mobile(0x1);
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.Name = "Test Mobile";
@ -211,7 +211,7 @@ namespace Server.Tests.Network
[Fact]
public void TestCharacterListOld()
{
var firstMobile = new Mobile(0x1);
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.Name = "Test Mobile";

6
Projects/Server.Tests/Tests/Network/Packets/Outgoing/CombatPacketTests.cs
View file

@ -9,8 +9,8 @@ namespace Server.Tests.Network
[Fact]
public void TestSwing()
{
Serial attacker = 0x1000;
Serial defender = 0x2000;
Serial attacker = (Serial)0x1024;
Serial defender = (Serial)0x2048;
var expected = new Swing(attacker, defender).Compile();
@ -36,7 +36,7 @@ namespace Server.Tests.Network
[Fact]
public void TestChangeCombatant()
{
Serial serial = 0x1024;
Serial serial = (Serial)0x1024;
var expected = new ChangeCombatant(serial).Compile();

22
Projects/Server.Tests/Tests/Network/Packets/Outgoing/ContainerPacketTests.cs
View file

@ -12,7 +12,7 @@ namespace Server.Tests.Network
[Fact]
public void TestContainerDisplay()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
ushort gumpId = 100;
var expected = new ContainerDisplay(serial, gumpId).Compile();
@ -27,7 +27,7 @@ namespace Server.Tests.Network
[Fact]
public void TestContainerDisplayHS()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
ushort gumpId = 100;
var expected = new ContainerDisplayHS(serial, gumpId).Compile();
@ -43,7 +43,7 @@ namespace Server.Tests.Network
[Fact]
public void TestDisplaySpellbook()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
var expected = new DisplaySpellbook(serial).Compile();
@ -57,7 +57,7 @@ namespace Server.Tests.Network
[Fact]
public void TestDisplaySpellbookHS()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
var expected = new DisplaySpellbookHS(serial).Compile();
@ -72,7 +72,7 @@ namespace Server.Tests.Network
[Fact]
public void TestNewSpellbookContent()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
ushort graphic = 100;
ushort offset = 10;
ulong content = 0x123456789ABCDEF0;
@ -93,7 +93,7 @@ namespace Server.Tests.Network
[Fact]
public void TestSpellbookContent()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
ushort offset = 10;
ushort graphic = 100;
ulong content = 0x123456789ABCDEF0;
@ -110,7 +110,7 @@ namespace Server.Tests.Network
[Fact]
public void TestSpellbookContent6017()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
ushort offset = 10;
ushort graphic = 100;
ulong content = 0x123456789ABCDEF0;
@ -128,7 +128,7 @@ namespace Server.Tests.Network
[Fact]
public void TestContainerContentUpdate()
{
Serial serial = 0x1;
Serial serial = (Serial)0x1024;
var item = new Item(serial);
var expected = new ContainerContentUpdate(item).Compile();
@ -143,7 +143,7 @@ namespace Server.Tests.Network
[Fact]
public void TestContainerContentUpdate6017()
{
Serial serial = 0x1;
Serial serial = (Serial)0x1024;
var item = new Item(serial);
var expected = new ContainerContentUpdate6017(item).Compile();
@ -163,7 +163,7 @@ namespace Server.Tests.Network
cont.AddItem(new Item(World.NewItem));
cont.Map = Map.Felucca;
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.AccessLevel = AccessLevel.Administrator;
m.Map = Map.Felucca;
@ -184,7 +184,7 @@ namespace Server.Tests.Network
cont.AddItem(new Item(World.NewItem));
cont.Map = Map.Felucca;
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.AccessLevel = AccessLevel.Administrator;
m.Map = Map.Felucca;

4
Projects/Server.Tests/Tests/Network/Packets/Outgoing/DamagePacketTests.cs
View file

@ -9,7 +9,7 @@ namespace Server.Tests.Network
[Theory, InlineData(10), InlineData(-5), InlineData(1024)]
public void TestDamagePacketOld(int inputAmount)
{
Serial serial = 0x1024;
Serial serial = (Serial)0x1024;
var expected = new DamagePacketOld(serial, inputAmount).Compile();
@ -23,7 +23,7 @@ namespace Server.Tests.Network
[Theory, InlineData(10), InlineData(-5), InlineData(1024), InlineData(100000)]
public void TestDamage(int inputAmount)
{
Serial serial = 0x1024;
Serial serial = (Serial)0x1024;
var expected = new DamagePacket(serial, inputAmount).Compile();

12
Projects/Server.Tests/Tests/Network/Packets/Outgoing/EffectPacketTests.cs
View file

@ -24,9 +24,9 @@ namespace Server.Tests.Network
public void TestParticleEffect()
{
var effectType = EffectType.Moving;
Serial serial = 0x4000;
Serial from = 0x1000;
Serial to = 0x2000;
Serial serial = (Serial)0x4000;
Serial from = (Serial)0x1000;
Serial to = (Serial)0x2000;
var itemId = 0x100;
var fromPoint = new Point3D(1000, 100, -10);
var toPoint = new Point3D(1500, 500, 0);
@ -63,8 +63,8 @@ namespace Server.Tests.Network
public void TestHuedEffect()
{
var effectType = EffectType.Moving;
Serial from = 0x1000;
Serial to = 0x2000;
Serial from = (Serial)0x1000;
Serial to = (Serial)0x2000;
var itemId = 0x100;
var fromPoint = new Point3D(1000, 100, -10);
var toPoint = new Point3D(1500, 500, 0);
@ -105,7 +105,7 @@ namespace Server.Tests.Network
[Fact]
public void TestBoltEffect()
{
IEntity entity = new Entity(0x1000, new Point3D(1000, 100, -10), Map.Felucca);
IEntity entity = new Entity((Serial)0x1000, new Point3D(1000, 100, -10), Map.Felucca);
var hue = 0x1024;
var expected = new BoltEffect(entity, hue).Compile();

4
Projects/Server.Tests/Tests/Network/Packets/Outgoing/EquipmentPacketTests.cs
View file

@ -13,7 +13,7 @@ namespace Server.Tests.Network
[InlineData("", true)]
public void TestDisplayEquipmentInfo(string name, bool unidentified)
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.RawName = name;
@ -49,7 +49,7 @@ namespace Server.Tests.Network
[Fact]
public void TestEquipUpdate()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
var item = new Item(World.NewItem) { Parent = m };

4
Projects/Server.Tests/Tests/Network/Packets/Outgoing/GumpPacketTests.cs
View file

@ -23,7 +23,7 @@ namespace Server.Tests.Network
[Fact]
public void TestDisplaySignGump()
{
Serial gumpSerial = 0x1000;
Serial gumpSerial = (Serial)0x1000;
var gumpId = 100;
var unknownString = "This is an unknown string";
var caption = "This is a caption";
@ -60,7 +60,7 @@ namespace Server.Tests.Network
[InlineData(ProtocolChanges.Unpack)]
public void TestGumpPacketAdmin(ProtocolChanges changes)
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.RawName = "Test Mobile";
m.AccessLevel = AccessLevel.Administrator;

5
Projects/Server.Tests/Tests/Network/Packets/Outgoing/GumpPackets.cs
View file

@ -16,6 +16,7 @@ namespace Server.Tests
void AppendLayout(bool val);
void AppendLayout(int val);
void AppendLayout(uint val);
void AppendLayout(Serial serial);
void AppendLayoutNS(int val);
void AppendLayout(string text);
void AppendLayoutNS(string text);
@ -89,6 +90,8 @@ namespace Server.Tests
m_Layout.Write(m_Buffer, 0, bytes);
}
public void AppendLayout(Serial serial) => AppendLayout(serial.Value);
public void AppendLayoutNS(int val)
{
var toString = val.ToString();
@ -232,6 +235,8 @@ namespace Server.Tests
m_LayoutLength += bytes;
}
public void AppendLayout(Serial serial) => AppendLayout(serial.Value);
public void AppendLayoutNS(int val)
{
var toString = val.ToString();

6
Projects/Server.Tests/Tests/Network/Packets/Outgoing/ItemPacketTests.cs
View file

@ -9,7 +9,7 @@ namespace Server.Tests.Network
[Fact]
public void TestWorldItemPacket()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
var itemId = 1;
// Move to fixture
@ -45,7 +45,7 @@ namespace Server.Tests.Network
[Fact]
public void TestWorldItemSAPacket()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
ushort itemId = 1;
// Move to fixture
@ -81,7 +81,7 @@ namespace Server.Tests.Network
[Fact]
public void TestWorldItemHSPacket()
{
Serial serial = 0x1000;
Serial serial = (Serial)0x1024;
var itemId = 1;
// Move to fixture

2
Projects/Server.Tests/Tests/Network/Packets/Outgoing/LightPacketTests.cs
View file

@ -22,7 +22,7 @@ namespace Server.Tests.Network
[Fact]
public void TestPersonalLightLevel()
{
Serial serial = 0x1024;
Serial serial = (Serial)0x1024;
byte lightLevel = 5;
var expected = new PersonalLightLevel(serial, lightLevel).Compile();

2
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MenuPacketTests.cs
View file

@ -81,7 +81,7 @@ namespace Server.Tests.Network
[InlineData(true, true)]
public void TestDisplayContextMenu(bool newHaven, bool newPacket)
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
var item = new ContextMenuItem(World.NewItem, newPacket);

14
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessagePacketTests.cs
View file

@ -10,7 +10,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMessageLocalized()
{
Serial serial = 0x1;
Serial serial = (Serial)0x1024;
var graphic = 0x100;
var messageType = MessageType.Label;
var hue = 1024;
@ -49,7 +49,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMessageLocalizedAffix()
{
Serial serial = 0x1;
Serial serial = (Serial)0x1024;
var graphic = 0x100;
var messageType = MessageType.Label;
var hue = 1024;
@ -94,7 +94,7 @@ namespace Server.Tests.Network
[Fact]
public void TestAsciiMessage()
{
Serial serial = 0x1;
Serial serial = (Serial)0x1024;
var graphic = 0x100;
var messageType = MessageType.Label;
var hue = 1024;
@ -132,7 +132,7 @@ namespace Server.Tests.Network
[Fact]
public void TestUnicodeMessage()
{
Serial serial = 0x1;
Serial serial = (Serial)0x1024;
var graphic = 0x100;
var messageType = MessageType.Label;
var hue = 1024;
@ -172,8 +172,8 @@ namespace Server.Tests.Network
[Fact]
public void TestFollowMessage()
{
Serial serial = 0x1;
Serial serial2 = 0x2;
Serial serial = (Serial)0x1024;
Serial serial2 = (Serial)0x2;
var expected = new FollowMessage(serial, serial2).Compile();
@ -187,7 +187,7 @@ namespace Server.Tests.Network
[Fact]
public void TestObjectHelpResponse()
{
Serial s = 0x100;
Serial s = (Serial)0x100;
var text = "This is some testing text";
var expected = new ObjectHelpResponse(s, text).Compile();

50
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MobilePacketTests.cs
View file

@ -10,8 +10,8 @@ namespace Server.Tests.Network
[Fact]
public void TestDeathAnimation()
{
Serial killed = 0x1;
Serial corpse = 0x1000;
Serial killed = (Serial)0x1;
Serial corpse = (Serial)0x1000;
var expected = new DeathAnimation(killed, corpse).Compile();
@ -25,7 +25,7 @@ namespace Server.Tests.Network
[Fact]
public void TestBondStatus()
{
Serial petSerial = 0x1;
Serial petSerial = (Serial)0x1;
const bool bonded = true;
var expected = new BondedStatus(petSerial, bonded).Compile();
@ -42,7 +42,7 @@ namespace Server.Tests.Network
[InlineData(ProtocolChanges.None)]
public void TestMobileMoving(ProtocolChanges protocolChanges)
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
var noto = 10;
@ -63,7 +63,7 @@ namespace Server.Tests.Network
[InlineData("Some Really Long Mobile Name That Gets Cut off")]
public void TestMobileName(string name)
{
var m = new Mobile(0x1) { Name = name };
var m = new Mobile((Serial)0x1) { Name = name };
m.DefaultMobileInit();
var expected = new MobileName(m).Compile();
@ -80,7 +80,7 @@ namespace Server.Tests.Network
[InlineData(10, 100, 25, true, false, 0)]
public void TestMobileAnimation(int action, int frameCount, int repeatCount, bool reverse, bool repeat, byte delay)
{
Serial mobile = 0x1;
Serial mobile = (Serial)0x1;
var expected = new MobileAnimation(
mobile,
@ -112,7 +112,7 @@ namespace Server.Tests.Network
[InlineData(10, 100, 20)]
public void TestNewMobileAnimation(int action, int frameCount, byte delay)
{
Serial mobile = 0x1;
Serial mobile = (Serial)0x1;
var expected = new NewMobileAnimation(
mobile,
@ -140,7 +140,7 @@ namespace Server.Tests.Network
public void TestHealthbarPoison(string pName)
{
var p = Poison.GetPoison(pName);
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Poison = p;
@ -160,7 +160,7 @@ namespace Server.Tests.Network
[InlineData(true, true)]
public void TestYellowBar(bool isBlessed, bool isYellowHealth)
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Blessed = isBlessed;
m.YellowHealthbar = isYellowHealth;
@ -179,7 +179,7 @@ namespace Server.Tests.Network
[InlineData(false)]
public void TestMobileStatusCompact(bool canBeRenamed)
{
var m = new Mobile(0x1) { Name = "Random Mobile 1" };
var m = new Mobile((Serial)0x1) { Name = "Random Mobile 1" };
m.DefaultMobileInit();
m.Str = 50;
m.Hits = 100;
@ -203,7 +203,7 @@ namespace Server.Tests.Network
[InlineData(ProtocolChanges.Version502b)]
public void TestMobileStatus(ProtocolChanges changes)
{
var beholder = new Mobile(0x1) { Name = "Random Mobile 1" };
var beholder = new Mobile((Serial)0x1) { Name = "Random Mobile 1" };
beholder.DefaultMobileInit();
beholder.Str = 50;
beholder.Hits = 100;
@ -212,7 +212,7 @@ namespace Server.Tests.Network
beholder.Dex = 25;
beholder.Stam = 100;
var beheld = new Mobile(0x2) { Name = "Random Mobile 2" };
var beheld = new Mobile((Serial)0x2) { Name = "Random Mobile 2" };
beheld.DefaultMobileInit();
beheld.Str = 50;
beheld.Hits = 100;
@ -237,7 +237,7 @@ namespace Server.Tests.Network
[InlineData(ProtocolChanges.Version502b)]
public void TestMobileStatusExtendedSelf(ProtocolChanges changes)
{
var m = new Mobile(0x1) { Name = "Random Mobile 1" };
var m = new Mobile((Serial)0x1) { Name = "Random Mobile 1" };
m.DefaultMobileInit();
m.Str = 50;
m.Hits = 100;
@ -261,7 +261,7 @@ namespace Server.Tests.Network
[InlineData(ProtocolChanges.StygianAbyss, 100)]
public void TestMobileUpdate(ProtocolChanges changes, int solidHueOverride)
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.SolidHueOverride = solidHueOverride;
@ -289,13 +289,13 @@ namespace Server.Tests.Network
ProtocolChanges changes, int hairItemId, int hairHue, int facialHairItemId, int facialHairHue
)
{
var beholder = new Mobile(0x1)
var beholder = new Mobile((Serial)0x1)
{
Name = "Random Mobile 1"
};
beholder.DefaultMobileInit();
var beheld = new Mobile(0x2)
var beheld = new Mobile((Serial)0x2)
{
Name = "Random Mobile 2"
};
@ -333,7 +333,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMobileHits()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Str = 100;
m.Hits = 100;
@ -350,7 +350,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMobileHitsN()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Str = 100;
m.Hits = 100;
@ -367,7 +367,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMobileMana()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Int = 75;
m.Mana = 100;
@ -384,7 +384,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMobileManaN()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Int = 75;
m.Mana = 100;
@ -401,7 +401,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMobileStam()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Dex = 75;
m.Stam = 100;
@ -418,7 +418,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMobileStamN()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Dex = 75;
m.Stam = 100;
@ -435,7 +435,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMobileAttributes()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Str = 50;
m.Hits = 100;
@ -456,7 +456,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMobileAttributesN()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Str = 50;
m.Hits = 100;
@ -477,7 +477,7 @@ namespace Server.Tests.Network
[Fact]
public void TestRemoveEntity()
{
Serial e = 0x1000;
Serial e = (Serial)0x1000;
var expected = new RemoveEntity(e).Compile();
var ns = PacketTestUtilities.CreateTestNetState();

4
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MovementPacketTests.cs
View file

@ -37,7 +37,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMovementRej()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
const byte seq = 100;
@ -54,7 +54,7 @@ namespace Server.Tests.Network
[Fact]
public void TestMovementAck()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
const byte seq = 100;

19
Projects/Server.Tests/Tests/Network/Packets/Outgoing/PlayerPacketTests.cs
View file

@ -12,7 +12,7 @@ namespace Server.Tests.Network
[InlineData(StatLockType.Down, StatLockType.Up, StatLockType.Locked)]
public void TestStatLockInfo(StatLockType str, StatLockType intel, StatLockType dex)
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.StrLock = str;
m.IntLock = intel;
@ -77,11 +77,10 @@ namespace Server.Tests.Network
[InlineData(0x1000u, null, null, null)]
public void TestDisplayProfile(uint serial, string header, string body, string footer)
{
Serial m = serial;
var expected = new DisplayProfile(m, header, body, footer).Compile();
var expected = new DisplayProfile((Serial)serial, header, body, footer).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendDisplayProfile(m, header, body, footer);
ns.SendDisplayProfile((Serial)serial, header, body, footer);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
@ -146,7 +145,7 @@ namespace Server.Tests.Network
[Fact]
public void TestSkillsUpdate()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
var skills = m.Skills;
@ -182,7 +181,7 @@ namespace Server.Tests.Network
[InlineData(SkillName.Begging, 100000, 1000)]
public void TestSkillChange(SkillName skillName, int baseFixedPoint, int capFixedPoint)
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
var skill = m.Skills[skillName];
@ -222,8 +221,8 @@ namespace Server.Tests.Network
int itemId, int hue, int amount
)
{
var src = new Entity(srcSerial, new Point3D(srcX, srcY, srcZ), null);
var targ = new Entity(trgSerial, new Point3D(trgX, trgY, trgZ), null);
var src = new Entity((Serial)srcSerial, new Point3D(srcX, srcY, srcZ), null);
var targ = new Entity((Serial)trgSerial, new Point3D(trgX, trgY, trgZ), null);
var expected = new DragEffect(src, targ, itemId, hue, amount).Compile();
@ -258,10 +257,10 @@ namespace Server.Tests.Network
[InlineData(0x1024u, "Test Title", true, false)]
public void TestDisplayPaperdoll(uint m, string title, bool warmode, bool canLift)
{
var expected = new DisplayPaperdoll(m, title, warmode, canLift).Compile();
var expected = new DisplayPaperdoll((Serial)m, title, warmode, canLift).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendDisplayPaperdoll(m, title, warmode, canLift);
ns.SendDisplayPaperdoll((Serial)m, title, warmode, canLift);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);

6
Projects/Server.Tests/Tests/Network/Packets/Outgoing/SecureTradePacketTests.cs
View file

@ -12,7 +12,7 @@ namespace Server.Tests.Network
[InlineData("this is a really long name that is more than 30 characters, probably")]
public void TestDisplaySecureTrade(string name)
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
var firstCont = new Container(World.NewItem);
@ -77,7 +77,7 @@ namespace Server.Tests.Network
[Fact]
public void TestSecureTradeEquip()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
var cont = new Container(World.NewItem);
@ -95,7 +95,7 @@ namespace Server.Tests.Network
[Fact]
public void TestSecureTradeEquip6017()
{
var m = new Mobile(0x1);
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
var cont = new Container(World.NewItem);

6
Projects/Server.Tests/Tests/Network/Packets/Outgoing/VendorBuyPacketTests.cs
View file

@ -39,7 +39,7 @@ namespace Server.Tests.Network
[InlineData(ProtocolChanges.HighSeas)]
public void TestDisplayBuyList(ProtocolChanges protocolChanges)
{
var vendor = new Mobile(0x1);
var vendor = new Mobile((Serial)0x1);
vendor.DefaultMobileInit();
var ns = PacketTestUtilities.CreateTestNetState();
@ -56,7 +56,7 @@ namespace Server.Tests.Network
[Fact]
public void TestVendorBuyList()
{
var vendor = new Mobile(0x1);
var vendor = new Mobile((Serial)0x1);
vendor.DefaultMobileInit();
var cont = new Container(World.NewItem);
@ -80,7 +80,7 @@ namespace Server.Tests.Network
[Fact]
public void TestEndVendorBuy()
{
var vendor = new Mobile(0x1);
var vendor = new Mobile((Serial)0x1);
vendor.DefaultMobileInit();
var expected = new EndVendorBuy(vendor.Serial).Compile();

4
Projects/Server.Tests/Tests/Network/Packets/Outgoing/VendorSellPacketTests.cs
View file

@ -11,7 +11,7 @@ namespace Server.Tests.Network
[Fact]
public void TestVendorSellList()
{
var vendor = new Mobile(0x1024u);
var vendor = new Mobile((Serial)0x1024u);
vendor.DefaultMobileInit();
var item1 = new Item(World.NewItem);
@ -37,7 +37,7 @@ namespace Server.Tests.Network
[Fact]
public void TestEndVendorSell()
{
var vendor = new Mobile(0x1024u);
var vendor = new Mobile((Serial)0x1024u);
vendor.DefaultMobileInit();
var expected = new EndVendorBuy(vendor.Serial).Compile();

4
Projects/Server.Tests/Tests/Network/Packets/Outgoing/VirtualHairPacketTests.cs
View file

@ -10,7 +10,7 @@ namespace Server.Tests
[Fact]
public void TestSendVirtualHairUpdate()
{
var m = new Mobile(0x1024u);
var m = new Mobile((Serial)0x1024u);
m.DefaultMobileInit();
m.HairHue = 0x1000;
m.HairItemID = 0x2000;
@ -27,7 +27,7 @@ namespace Server.Tests
[Fact]
public void TestSendRemoveVirtualHair()
{
var m = new Mobile(0x1024u);
var m = new Mobile((Serial)0x1024u);
m.DefaultMobileInit();
var expected = new RemoveHair(m).Compile();