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

fix(core): Adds object help response packets (#336)

Browse source
This commit is contained in:
Kamron Batman 2020-12-07 21:19:21 -08:00 • committed by GitHub
parent c77b5b1462
commit 4b2e4fbd36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessageTests.cs → Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessagePacketTests.cs
View file

@ -184,6 +184,21 @@ namespace Server.Tests.Network
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestObjectHelpResponse()
{
Serial s = 0x100;
var text = "This is some testing text";
var expected = new ObjectHelpResponse(s, text).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendHelpResponse(s, text);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
internal class TestPrompt : Prompt
{
}

11
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessagePackets.cs
View file

@ -141,4 +141,15 @@ namespace Server.Network
Stream.Write((short)0);
}
}
public sealed class ObjectHelpResponse : Packet
{
public ObjectHelpResponse(Serial e, string text) : base(0xB7)
{
EnsureCapacity(9 + text.Length * 2);
Stream.Write(e);
Stream.WriteBigUniNull(text);
}
}
}

31
Projects/Server.Tests/Tests/Network/Packets/Outgoing/ObjectHelpResponseTests.cs
View file

@ -1,31 +0,0 @@
using System;
using System.Buffers;
using Server.Network;
using Xunit;
namespace Server.Tests.Network
{
public class ObjectHelpResponseTests
{
[Fact]
public void TestObjectHelpResponse()
{
Serial s = 0x100;
var text = "This is some testing text";
var data = new ObjectHelpResponse(s, text).Compile();
var length = 9 + text.Length * 2;
Span<byte> expectedData = stackalloc byte[length];
var pos = 0;
expectedData.Write(ref pos, (byte)0xB7); // Packet ID
expectedData.Write(ref pos, (ushort)length); // Length
expectedData.Write(ref pos, s);
expectedData.WriteBigUniNull(ref pos, text);
AssertThat.Equal(data, expectedData);
}
}
}

28
Projects/Server/Network/Packets/ObjectHelpResponsePackets.cs
View file

@ -1,28 +0,0 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: ObjectHelpResponsePackets.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
namespace Server.Network
{
public sealed class ObjectHelpResponse : Packet
{
public ObjectHelpResponse(Serial e, string text) : base(0xB7)
{
EnsureCapacity(9 + text.Length * 2);
Stream.Write(e);
Stream.WriteBigUniNull(text);
}
}
}

18
Projects/Server/Network/Packets/OutgoingMessagePackets.cs
View file

@ -249,5 +249,23 @@ namespace Server.Network
ns.Send(ref buffer, writer.Position);
}
public static void SendHelpResponse(this NetState ns, Serial s, string text)
{
text = text?.Trim() ?? "";
if (ns == null || text.Length == 0 || !ns.GetSendBuffer(out var buffer))
{
return;
}
var writer = new CircularBufferWriter(buffer);
writer.Write((byte)0xB7);
writer.Write((ushort)(9 + text.Length * 2));
writer.Write(s);
writer.WriteBigUniNull(text);
ns.Send(ref buffer, writer.Position);
}
}
}