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

Converts targeting packets (#330)

Browse source 
- [X] Converts targeting packets.

### BREAKING CHANGE TO TARGET CLASS

```cs
public virtual Packet GetPacketFor(NetState ns)
```

Changed to:
```cs
public virtual void SendPacketTo(NetState ns)
```

Bumps release version
This commit is contained in:
Kamron Batman 2020-11-29 23:01:31 -08:00 • committed by GitHub
parent 8c4c30da7d
commit b71c754738
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 113 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Projects/Server.Tests/Helpers/AssertExtensions.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Text;
namespace Server.Tests
{

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

@ -1,5 +1,4 @@
using System;
using System.Buffers;
using System.Collections.Generic;
using Server.Network;
using Xunit;

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

@ -1,6 +1,4 @@
using System;
using System.Buffers;
using Server.Items;
using Server.Network;
using Xunit;

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

@ -1,5 +1,4 @@
using System;
using System.Buffers;
using Server.Network;
using Xunit;

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

@ -1,7 +1,5 @@
using System;
using System.Buffers;
using System.Collections.Generic;
using System.Linq;
using Server.ContextMenus;
using Server.Menus.ItemLists;
using Server.Menus.Questions;

1
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessageTests.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Buffers;
using Server.Network;
using Xunit;

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

@ -1,5 +1,4 @@
using System;
using System.Buffers;
using Server.Items;
using Server.Network;
using Xunit;

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

@ -1,18 +1,3 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: TargetPackets.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.IO;
using Server.Targeting;

111
Projects/Server.Tests/Tests/Network/Packets/Outgoing/TargetPacketsTests.cs
View file

@ -39,37 +39,14 @@ namespace Server.Tests.Network
var p = new Point3D(1000, 100, 10);
MultiTarget t = new TestMultiTarget(multiID, p);
var data = new MultiTargetReqHS(t).Compile();
var expected = new MultiTargetReqHS(t).Compile();
Span<byte> expectedData = stackalloc byte[30];
var pos = 0;
using var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges |= ProtocolChanges.HighSeas;
ns.SendMultiTargetReq(t);
expectedData.Write(ref pos, (byte)0x99); // Packet ID
expectedData.Write(ref pos, t.AllowGround);
expectedData.Write(ref pos, t.TargetID);
#if NO_LOCAL_INIT
expectedData.Write(ref pos, 0);
expectedData.Write(ref pos, (ushort)0);
expectedData.Write(ref pos, (ushort)0);
expectedData.Write(ref pos, (byte)0);
expectedData.Write(ref pos, (byte)0);
expectedData.Write(ref pos, (ushort)0);
#else
pos += 12;
#endif
expectedData.Write(ref pos, (short)t.MultiID);
expectedData.Write(ref pos, (ushort)t.Offset.X);
expectedData.Write(ref pos, (ushort)t.Offset.Y);
expectedData.Write(ref pos, (short)t.Offset.Z);
#if NO_LOCAL_INIT
// Hue (4 bytes)
expectedData.Write(ref pos, 0);
#endif
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
@ -79,83 +56,37 @@ namespace Server.Tests.Network
var p = new Point3D(1000, 100, 10);
MultiTarget t = new TestMultiTarget(multiID, p);
var data = new MultiTargetReq(t).Compile();
var expected = new MultiTargetReq(t).Compile();
Span<byte> expectedData = stackalloc byte[26];
var pos = 0;
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMultiTargetReq(t);
expectedData.Write(ref pos, (byte)0x99); // Packet ID
expectedData.Write(ref pos, t.AllowGround);
expectedData.Write(ref pos, t.TargetID);
#if NO_LOCAL_INIT
expectedData.Write(ref pos, 0);
expectedData.Write(ref pos, (ushort)0);
expectedData.Write(ref pos, (ushort)0);
expectedData.Write(ref pos, (byte)0);
expectedData.Write(ref pos, (byte)0);
expectedData.Write(ref pos, (ushort)0);
#else
pos += 12;
#endif
expectedData.Write(ref pos, (short)t.MultiID);
expectedData.Write(ref pos, (ushort)t.Offset.X);
expectedData.Write(ref pos, (ushort)t.Offset.Y);
expectedData.Write(ref pos, (short)t.Offset.Z);
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestCancelTarget()
{
var data = new CancelTarget().Compile();
var expected = new CancelTarget().Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCancelTarget();
Span<byte> expectedData = stackalloc byte[19];
var pos = 0;
expectedData.Write(ref pos, (byte)0x6C); // Packet ID
expectedData.Write(ref pos, (byte)0);
expectedData.Write(ref pos, 0);
expectedData.Write(ref pos, (byte)3); // Beneficial / Harmful
#if NO_LOCAL_INIT
expectedData.Write(ref pos, 0);
expectedData.Write(ref pos, (ushort)0);
expectedData.Write(ref pos, (ushort)0);
expectedData.Write(ref pos, (byte)0);
expectedData.Write(ref pos, (byte)0);
expectedData.Write(ref pos, (ushort)0);
#endif
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestTargetReq()
{
var t = new TestTarget(10, true, TargetFlags.Beneficial);
var data = new TargetReq(t).Compile();
var expected = new TargetReq(t).Compile();
Span<byte> expectedData = stackalloc byte[19];
var pos = 0;
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendTargetReq(t);
expectedData.Write(ref pos, (byte)0x6C); // Packet ID
expectedData.Write(ref pos, t.AllowGround);
expectedData.Write(ref pos, t.TargetID);
expectedData.Write(ref pos, (byte)t.Flags);
#if NO_LOCAL_INIT
expectedData.Write(ref pos, 0);
expectedData.Write(ref pos, (ushort)0);
expectedData.Write(ref pos, (ushort)0);
expectedData.Write(ref pos, (byte)0);
expectedData.Write(ref pos, (byte)0);
expectedData.Write(ref pos, (ushort)0);
#endif
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
}
}

4
Projects/Server/Mobiles/Mobile.cs
View file

@ -1059,9 +1059,9 @@ namespace Server
m_Target = newTarget;
if (newTarget != null && m_NetState != null && !TargetLocked)
if (newTarget != null && !TargetLocked)
{
m_NetState.Send(newTarget.GetPacketFor(m_NetState));
newTarget.SendTargetTo(m_NetState);
}
OnTargetChange();

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

@ -16,7 +16,6 @@
using System;
using System.Buffers;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
namespace Server.Network

87
Projects/Server/Network/Packets/OutgoingTargetPackets.cs Normal file
View file

@ -0,0 +1,87 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: OutgoingTargetPackets.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;
using System.Buffers;
using Server.Targeting;
namespace Server.Network
{
public static class OutgoingTargetPackets
{
public static void SendMultiTargetReq(this NetState ns, MultiTarget t)
{
if (ns == null || !ns.GetSendBuffer(out var buffer))
{
return;
}
var writer = new CircularBufferWriter(buffer);
writer.Write((byte)0x99); // Packet ID
writer.Write(t.AllowGround);
writer.Write(t.TargetID);
writer.Write((byte)t.Flags);
writer.Clear(11);
writer.Write((short)t.MultiID);
writer.Write((short)t.Offset.X);
writer.Write((short)t.Offset.Y);
writer.Write((short)t.Offset.Z);
if (ns.HighSeas)
{
writer.Write(0);
}
ns.Send(ref buffer, writer.Position);
}
public static void SendCancelTarget(this NetState ns)
{
if (ns == null)
{
return;
}
Span<byte> span = stackalloc byte[]
{
0x6C, // Packet ID
0, // Allow Ground?
0, 0, 0, 0, // Target ID
3, // Flags
0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0
};
ns.Send(span);
}
public static void SendTargetReq(this NetState ns, Target t)
{
if (ns == null || !ns.GetSendBuffer(out var buffer))
{
return;
}
var writer = new CircularBufferWriter(buffer);
writer.Write((byte)0x6C); // Packet ID
writer.Write(t.AllowGround);
writer.Write(t.TargetID);
writer.Write((byte)t.Flags);
writer.Clear(12);
ns.Send(ref buffer, writer.Position);
}
}
}

10
Projects/Server/Targeting/MultiTarget.cs
View file

@ -18,14 +18,6 @@ namespace Server.Targeting
public Point3D Offset { get; set; }
public override Packet GetPacketFor(NetState ns)
{
if (ns.HighSeas)
{
return new MultiTargetReqHS(this);
}
return new MultiTargetReq(this);
}
public override void SendTargetTo(NetState ns) => ns.SendMultiTargetReq(this);
}
}

4
Projects/Server/Targeting/Target.cs
View file

@ -37,7 +37,7 @@ namespace Server.Targeting
public static void Cancel(Mobile m)
{
m.NetState?.Send(CancelTarget.Instance);
m.NetState.SendCancelTarget();
m.Target?.OnTargetCancel(m, TargetCancelType.Canceled);
}
@ -68,7 +68,7 @@ namespace Server.Targeting
OnTargetFinish(from);
}
public virtual Packet GetPacketFor(NetState ns) => new TargetReq(this);
public virtual void SendTargetTo(NetState ns) => ns.SendTargetReq(this);
public void Cancel(Mobile from, TargetCancelType type)
{

1
Projects/Server/World/World.cs
View file

@ -14,7 +14,6 @@
*************************************************************************/
using System;
using System.Buffers;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;

1
Projects/UOContent/Engines/ConPVP/Gumps/TournamentBracketGump.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Linq;
using System.Collections;
using System.Collections.Generic;
using System.Text;

1
Projects/UOContent/Items/Misc/Corpses/Corpse.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Buffers;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using Server.ContextMenus;

1
Projects/UOContent/Spells/Mysticism/HailStormSpell.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using Server.Network;
namespace Server.Spells.Mysticism
{

1
Projects/UOContent/Spells/Mysticism/NetherCycloneSpell.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using Server.Network;
namespace Server.Spells.Mysticism
{