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

fix: Fixes thread guard and cleans up incoming packet reader (#1641)

Browse source 
### Summary
* Fixes syntax compile error when THREADGUARD is enabled.
* Removes `int packetLength` from incoming packet handles since they aren't needed.

### Developer Notes
Incoming packet handler `SpanReader` is now properly scoped to that packet by length.
This commit is contained in:
Kamron Batman 2023-12-19 17:04:09 -08:00 • committed by GitHub
parent 25a75fdf24
commit 7d9bc9ff0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 190 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/UOContent/Items/Books/BookPackets.cs
View file

@ -29,7 +29,7 @@ namespace Server.Items
IncomingPackets.Register(0x93, 99, true, &OldHeaderChange);
}
public static void OldHeaderChange(NetState state, SpanReader reader, int packetLength)
public static void OldHeaderChange(NetState state, SpanReader reader)
{
var from = state.Mobile;
@ -48,7 +48,7 @@ namespace Server.Items
book.Author = Utility.FixHtml(author);
}
public static void HeaderChange(NetState state, SpanReader reader, int packetLength)
public static void HeaderChange(NetState state, SpanReader reader)
{
var from = state.Mobile;
@ -84,7 +84,7 @@ namespace Server.Items
book.Author = Utility.FixHtml(author);
}
public static void ContentChange(NetState state, SpanReader reader, int packetLength)
public static void ContentChange(NetState state, SpanReader reader)
{
var from = state.Mobile;

2
Projects/UOContent/Items/Bulletin Boards/BulletinBoardPackets.cs
View file

@ -47,7 +47,7 @@ namespace Server.Network
return $"{seconds} second{(seconds == 1 ? "" : "s")}";
}
public static void BBClientRequest(NetState state, SpanReader reader, int packetLength)
public static void BBClientRequest(NetState state, SpanReader reader)
{
var from = state.Mobile;

2
Projects/UOContent/Items/Games/Mahjong/MahjongPackets.cs
View file

@ -61,7 +61,7 @@ namespace Server.Engines.Mahjong
RegisterSubCommand(0x18, MoveDealerIndicator);
}
public static void OnPacket(NetState state, SpanReader reader, int packetLength)
public static void OnPacket(NetState state, SpanReader reader)
{
var game = World.FindItem((Serial)reader.ReadUInt32()) as MahjongGame;

2
Projects/UOContent/Items/Maps/MapItemPackets.cs
View file

@ -25,7 +25,7 @@ namespace Server.Network
IncomingPackets.Register(0x56, 11, true, &OnMapCommand);
}
private static void OnMapCommand(NetState state, SpanReader reader, int packetLength)
private static void OnMapCommand(NetState state, SpanReader reader)
{
var from = state.Mobile;