Updates map packets (#319)

This commit is contained in:
Kamron Batman 2020-11-17 20:58:28 -08:00 • committed by GitHub
parent 0726b4547b
commit ceb8d4ad49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 106 additions and 70 deletions

View file

@ -9,54 +9,40 @@ namespace Server.Tests.Network
[Fact] [Fact]
public void TestMapPatches() public void TestMapPatches()
{ {
var data = new MapPatches().Compile(); var expected = new MapPatches().Compile();
Span<byte> expectedData = stackalloc byte[] using var ns = PacketTestUtilities.CreateTestNetState();
{ ns.SendMapPatches();
0xBF, // Packet ID
0x00, 0x29, // Length
0x00, 0x18, // Sub-packet
0x00, 0x00, 0x00, 0x04, // 4 maps
0x00, 0x00, 0x00, 0x00, // Felucca
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, // Trammel
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, // Ilshenar
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, // Malas
0x00, 0x00, 0x00, 0x00
};
AssertThat.Equal(data, expectedData); var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
} }
[Fact] [Fact]
public void TestInvalidMapEnable() public void TestInvalidMapEnable()
{ {
var data = new InvalidMapEnable().Compile(); var expected = new InvalidMapEnable().Compile();
Span<byte> expectedData = stackalloc byte[] using var ns = PacketTestUtilities.CreateTestNetState();
{ ns.SendInvalidMap();
0xC6 // Packet ID
};
AssertThat.Equal(data, expectedData); var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
} }
[Fact] [Theory]
public void TestMapChange() [InlineData("Felucca")]
[InlineData("Malas")]
public void TestMapChange(string mapName)
{ {
var data = new MapChange(Map.Felucca).Compile(); var map = Map.Parse(mapName);
var expected = new MapChange(map).Compile();
Span<byte> expectedData = stackalloc byte[] using var ns = PacketTestUtilities.CreateTestNetState();
{ ns.SendMapChange(map);
0xBF, // Packet ID
0x00, 0x06, // Length
0x00, 0x08, // Sub-packet
0x00 // Felucca
};
AssertThat.Equal(data, expectedData); var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
} }
} }
} }

View file

@ -1,23 +1,7 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: MapPackets.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 namespace Server.Network
{ {
public sealed class MapPatches : Packet public sealed class MapPatches : Packet
{ {
// TODO: Base this on the client version and expansion
public MapPatches() : base(0xBF) public MapPatches() : base(0xBF)
{ {
EnsureCapacity(9 + 4 * 8); EnsureCapacity(9 + 4 * 8);

View file

@ -2856,14 +2856,11 @@ namespace Server
if (ns != null && m_Map != null) if (ns != null && m_Map != null)
{ {
ns.Sequence = 0; ns.Sequence = 0;
if (Map != null) ns.SendMapChange(Map);
{
ns.Send(new MapChange(Map));
}
if (!Core.SE && ns.ProtocolChanges < ProtocolChanges.Version6000) if (!Core.SE && ns.ProtocolChanges < ProtocolChanges.Version6000)
{ {
ns.Send(new MapPatches()); ns.SendMapPatches();
} }
ns.Send(SeasonChange.Instantiate(GetSeason(), true)); ns.Send(SeasonChange.Instantiate(GetSeason(), true));
@ -2995,14 +2992,11 @@ namespace Server
if (ns != null && m_Map != null) if (ns != null && m_Map != null)
{ {
ns.Sequence = 0; ns.Sequence = 0;
if (Map != null) ns.SendMapChange(Map);
{
ns.Send(new MapChange(Map));
}
if (!Core.SE && ns.ProtocolChanges < ProtocolChanges.Version6000) if (!Core.SE && ns.ProtocolChanges < ProtocolChanges.Version6000)
{ {
ns.Send(new MapPatches()); ns.SendMapPatches();
} }
ns.Send(SeasonChange.Instantiate(GetSeason(), true)); ns.Send(SeasonChange.Instantiate(GetSeason(), true));

View file

@ -303,14 +303,11 @@ namespace Server.Network
{ {
state.SendLoginConfirmation(m); state.SendLoginConfirmation(m);
if (m.Map != null) state.SendMapChange(m.Map);
{
state.Send(new MapChange(m.Map));
}
if (!Core.SE && state.ProtocolChanges < ProtocolChanges.Version6000) if (!Core.SE && state.ProtocolChanges < ProtocolChanges.Version6000)
{ {
state.Send(new MapPatches()); state.SendMapPatches();
} }
state.Send(SeasonChange.Instantiate(m.GetSeason(), true)); state.Send(SeasonChange.Instantiate(m.GetSeason(), true));
@ -392,10 +389,7 @@ namespace Server.Network
state.SendLoginComplete(); state.SendLoginComplete();
state.Send(new CurrentTime()); state.Send(new CurrentTime());
state.Send(SeasonChange.Instantiate(m.GetSeason(), true)); state.Send(SeasonChange.Instantiate(m.GetSeason(), true));
if (m.Map != null) state.SendMapChange(m.Map);
{
state.Send(new MapChange(m.Map));
}
EventSink.InvokeLogin(m); EventSink.InvokeLogin(m);

View file

@ -31,7 +31,7 @@ namespace Server.Network
writer.Write(serial); writer.Write(serial);
writer.Write((byte)level); writer.Write((byte)level);
ns.Send(ref buffer, 6); ns.Send(ref buffer, writer.Position);
} }
public static void SendGlobalLightLevel(this NetState ns, int level = 0) public static void SendGlobalLightLevel(this NetState ns, int level = 0)

View file

@ -0,0 +1,78 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: OutgoingMapPackets.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/>. *
*************************************************************************/
using System.Buffers;
namespace Server.Network
{
public static class OutgoingMapPackets
{
public static void SendMapPatches(this NetState ns)
{
if (ns == null || !ns.GetSendBuffer(out var buffer))
{
return;
}
var writer = new CircularBufferWriter(buffer);
writer.Write((byte)0xBF); // Packet ID
writer.Write((ushort)41); // Length
writer.Write((ushort)0x18); // Subpacket
writer.Write(4); // Map count?
writer.Write(Map.Felucca.Tiles.Patch.StaticBlocks);
writer.Write(Map.Felucca.Tiles.Patch.LandBlocks);
writer.Write(Map.Trammel.Tiles.Patch.StaticBlocks);
writer.Write(Map.Trammel.Tiles.Patch.LandBlocks);
writer.Write(Map.Ilshenar.Tiles.Patch.StaticBlocks);
writer.Write(Map.Ilshenar.Tiles.Patch.LandBlocks);
writer.Write(Map.Malas.Tiles.Patch.StaticBlocks);
writer.Write(Map.Malas.Tiles.Patch.LandBlocks);
ns.Send(ref buffer, writer.Position);
}
public static void SendInvalidMap(this NetState ns)
{
if (ns == null || !ns.GetSendBuffer(out var buffer))
{
return;
}
buffer[0] = 0xC6; // Packet ID
ns.Send(ref buffer, 1);
}
public static void SendMapChange(this NetState ns, Map map)
{
if (ns == null || map == null || !ns.GetSendBuffer(out var buffer))
{
return;
}
var writer = new CircularBufferWriter(buffer);
writer.Write((byte)0xBF); // Packet ID
writer.Write((ushort)6); // Length
writer.Write((ushort)0x08); // Subpacket
writer.Write((byte)map.MapID);
ns.Send(ref buffer, writer.Position);
}
}
}