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

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

4
Projects/UOContent.Tests/Tests/Network/Packets/ArrowPacketTests.cs
View file

@ -39,7 +39,7 @@ namespace Server.Tests.Network
[InlineData(100000, 100000)]
public void TestCancelArrowHS(int x, int y)
{
Serial serial = 0x1024;
Serial serial = (Serial)0x1024;
var expected = new CancelArrowHS(x, y, serial).Compile();
@ -57,7 +57,7 @@ namespace Server.Tests.Network
[InlineData(100000, 100000)]
public void TestSetArrowHS(int x, int y)
{
Serial serial = 0x1024;
Serial serial = (Serial)0x1024;
var expected = new SetArrowHS(x, y, serial).Compile();

6
Projects/UOContent.Tests/Tests/Network/Packets/BuffIconPacketTests.cs
View file

@ -16,11 +16,11 @@ namespace UOContent.Tests
{
var timeSpan = new TimeSpan(ts);
var expected = new AddBuffPacket(
mob, iconID, titleCliloc, secondaryCliloc, args, timeSpan
(Serial)mob, iconID, titleCliloc, secondaryCliloc, args, timeSpan
).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
BuffInfo.SendAddBuffPacket(ns, mob, iconID, titleCliloc, secondaryCliloc, args, (int)timeSpan.TotalMilliseconds);
BuffInfo.SendAddBuffPacket(ns, (Serial)mob, iconID, titleCliloc, secondaryCliloc, args, (int)timeSpan.TotalMilliseconds);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
@ -29,7 +29,7 @@ namespace UOContent.Tests
[Fact]
public void TestRemoveBuffIcon()
{
Serial m = 0x1024;
Serial m = (Serial)0x1024;
var buffIcon = BuffIcon.Disguised;
var expected = new RemoveBuffPacket(m, buffIcon).Compile();