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

fix(net): Clean up for mobile packets (#338)

Browse source 
### Breaking Change
- [X] `Mobile.GetOldPacketFlags()` no longer exists. Instead there is a flag for `Mobile.GetPacketFlags()`.

### Non-Breaking Changes
- [X] Consolidates move to world for mobiles
- [X] Consolidates mobile packets between stygian abyss and older

This PR supersedes changes in #337. That PR will need to be redone and broken out anyway.
This commit is contained in:
Kamron Batman 2020-12-10 17:46:58 -08:00 • committed by GitHub
parent 4b2e4fbd36
commit d71856ddbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 234 additions and 932 deletions
Download patch file Download diff file Expand all files Collapse all files

79
Projects/Server/Network/Packets/IncomingAccountPackets.cs
View file

@ -316,75 +316,26 @@ namespace Server.Network
state.Sequence = 0;
if (state.NewMobileIncoming)
{
state.Send(new MobileUpdate(m));
state.Send(new MobileUpdate(m));
state.Send(new MobileUpdate(m, state.StygianAbyss));
state.Send(new MobileUpdate(m, state.StygianAbyss));
m.CheckLightLevels(true);
m.CheckLightLevels(true);
state.Send(new MobileUpdate(m));
state.Send(new MobileUpdate(m, state.StygianAbyss));
state.Send(new MobileIncoming(m, m));
// state.Send( new MobileAttributes( m ) );
state.Send(new MobileStatus(m, m));
state.SendSetWarMode(m.Warmode);
state.Send(new MobileIncoming(state, m, m));
// state.Send( new MobileAttributes( m ) );
state.Send(new MobileStatus(m, m));
state.SendSetWarMode(m.Warmode);
m.SendEverything();
m.SendEverything();
state.SendSupportedFeature();
state.Send(new MobileUpdate(m));
// state.Send( new MobileAttributes( m ) );
state.Send(new MobileStatus(m, m));
state.SendSetWarMode(m.Warmode);
state.Send(new MobileIncoming(m, m));
}
else if (state.StygianAbyss)
{
state.Send(new MobileUpdate(m));
state.Send(new MobileUpdate(m));
m.CheckLightLevels(true);
state.Send(new MobileUpdate(m));
state.Send(new MobileIncomingSA(m, m));
// state.Send( new MobileAttributes( m ) );
state.Send(new MobileStatus(m, m));
state.SendSetWarMode(m.Warmode);
m.SendEverything();
state.SendSupportedFeature();
state.Send(new MobileUpdate(m));
// state.Send( new MobileAttributes( m ) );
state.Send(new MobileStatus(m, m));
state.SendSetWarMode(m.Warmode);
state.Send(new MobileIncomingSA(m, m));
}
else
{
state.Send(new MobileUpdateOld(m));
state.Send(new MobileUpdateOld(m));
m.CheckLightLevels(true);
state.Send(new MobileUpdateOld(m));
state.Send(new MobileIncomingOld(m, m));
// state.Send( new MobileAttributes( m ) );
state.Send(new MobileStatus(m, m));
state.SendSetWarMode(m.Warmode);
m.SendEverything();
state.SendSupportedFeature();
state.Send(new MobileUpdateOld(m));
// state.Send( new MobileAttributes( m ) );
state.Send(new MobileStatus(m, m));
state.SendSetWarMode(m.Warmode);
state.Send(new MobileIncomingOld(m, m));
}
state.SendSupportedFeature();
state.Send(new MobileUpdate(m, state.StygianAbyss));
// state.Send( new MobileAttributes( m ) );
state.Send(new MobileStatus(m, m));
state.SendSetWarMode(m.Warmode);
state.Send(new MobileIncoming(state, m, m));
state.SendLoginComplete();
state.Send(new CurrentTime());

11
Projects/Server/Network/Packets/IncomingPlayerPackets.cs
View file

@ -475,16 +475,9 @@ namespace Server.Network
return;
}
if (state.StygianAbyss)
{
state.Send(new MobileUpdate(from));
}
else
{
state.Send(new MobileUpdateOld(from));
}
state.Send(new MobileUpdate(from, state.StygianAbyss));
state.Send(MobileIncoming.Create(state, from, from));
state.Send(new MobileIncoming(state, from, from));
from.SendEverything();

365
Projects/Server/Network/Packets/MobilePackets.cs
View file

@ -29,7 +29,7 @@ namespace Server.Network
public sealed class MobileMoving : Packet
{
public MobileMoving(Mobile m, int noto) : base(0x77, 17)
public MobileMoving(Mobile m, int noto, bool stygianAbyss) : base(0x77, 17)
{
var loc = m.Location;
@ -47,32 +47,7 @@ namespace Server.Network
Stream.Write((sbyte)loc.m_Z);
Stream.Write((byte)m.Direction);
Stream.Write((short)hue);
Stream.Write((byte)m.GetPacketFlags());
Stream.Write((byte)noto);
}
}
public sealed class MobileMovingOld : Packet
{
public MobileMovingOld(Mobile m, int noto) : base(0x77, 17)
{
var loc = m.Location;
var hue = m.Hue;
if (m.SolidHueOverride >= 0)
{
hue = m.SolidHueOverride;
}
Stream.Write(m.Serial);
Stream.Write((short)m.Body);
Stream.Write((short)loc.m_X);
Stream.Write((short)loc.m_Y);
Stream.Write((sbyte)loc.m_Z);
Stream.Write((byte)m.Direction);
Stream.Write((short)hue);
Stream.Write((byte)m.GetOldPacketFlags());
Stream.Write((byte)m.GetPacketFlags(stygianAbyss));
Stream.Write((byte)noto);
}
}
@ -492,7 +467,7 @@ namespace Server.Network
public sealed class MobileUpdate : Packet
{
public MobileUpdate(Mobile m) : base(0x20, 19)
public MobileUpdate(Mobile m, bool stygianAbyss) : base(0x20, 19)
{
var hue = m.Hue;
@ -505,32 +480,7 @@ namespace Server.Network
Stream.Write((short)m.Body);
Stream.Write((byte)0);
Stream.Write((short)hue);
Stream.Write((byte)m.GetPacketFlags());
Stream.Write((short)m.X);
Stream.Write((short)m.Y);
Stream.Write((short)0);
Stream.Write((byte)m.Direction);
Stream.Write((sbyte)m.Z);
}
}
// Pre-7.0.0.0 Mobile Update
public sealed class MobileUpdateOld : Packet
{
public MobileUpdateOld(Mobile m) : base(0x20, 19)
{
var hue = m.Hue;
if (m.SolidHueOverride >= 0)
{
hue = m.SolidHueOverride;
}
Stream.Write(m.Serial);
Stream.Write((short)m.Body);
Stream.Write((byte)0);
Stream.Write((short)hue);
Stream.Write((byte)m.GetOldPacketFlags());
Stream.Write((byte)m.GetPacketFlags(stygianAbyss));
Stream.Write((short)m.X);
Stream.Write((short)m.Y);
Stream.Write((short)0);
@ -544,8 +494,12 @@ namespace Server.Network
private static readonly ThreadLocal<int[]> m_DupedLayersTL = new(() => new int[256]);
private static readonly ThreadLocal<int> m_VersionTL = new();
public MobileIncoming(Mobile beholder, Mobile beheld) : base(0x78)
public MobileIncoming(NetState ns, Mobile beholder, Mobile beheld) : base(0x78)
{
var sa = ns.StygianAbyss;
var newPacket = ns.NewMobileIncoming;
var itemIdMask = newPacket ? 0xFFFF : 0x7FFF;
var m_Version = ++m_VersionTL.Value;
var m_DupedLayers = m_DupedLayersTL.Value;
@ -578,7 +532,7 @@ namespace Server.Network
Stream.Write((sbyte)beheld.Z);
Stream.Write((byte)beheld.Direction);
Stream.Write((short)hue);
Stream.Write((byte)beheld.GetPacketFlags());
Stream.Write((byte)beheld.GetPacketFlags(sa));
Stream.Write((byte)Notoriety.Compute(beholder, beheld));
for (var i = 0; i < eq.Count; ++i)
@ -598,142 +552,10 @@ namespace Server.Network
hue = beheld.SolidHueOverride;
}
var itemID = item.ItemID & 0xFFFF;
var itemID = item.ItemID & itemIdMask;
var writeHue = newPacket || hue != 0;
Stream.Write(item.Serial);
Stream.Write((ushort)itemID);
Stream.Write(layer);
Stream.Write((short)hue);
}
}
if (beheld.HairItemID > 0)
{
if (m_DupedLayers[(int)Layer.Hair] != m_Version)
{
m_DupedLayers[(int)Layer.Hair] = m_Version;
hue = beheld.HairHue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
var itemID = beheld.HairItemID & 0xFFFF;
Stream.Write(HairInfo.FakeSerial(beheld));
Stream.Write((ushort)itemID);
Stream.Write((byte)Layer.Hair);
Stream.Write((short)hue);
}
}
if (beheld.FacialHairItemID > 0)
{
if (m_DupedLayers[(int)Layer.FacialHair] != m_Version)
{
m_DupedLayers[(int)Layer.FacialHair] = m_Version;
hue = beheld.FacialHairHue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
var itemID = beheld.FacialHairItemID & 0xFFFF;
Stream.Write(FacialHairInfo.FakeSerial(beheld));
Stream.Write((ushort)itemID);
Stream.Write((byte)Layer.FacialHair);
Stream.Write((short)hue);
}
}
Stream.Write(0); // terminate
}
public static Packet Create(NetState ns, Mobile beholder, Mobile beheld)
{
if (ns.NewMobileIncoming)
{
return new MobileIncoming(beholder, beheld);
}
if (ns.StygianAbyss)
{
return new MobileIncomingSA(beholder, beheld);
}
return new MobileIncomingOld(beholder, beheld);
}
}
public sealed class MobileIncomingSA : Packet
{
private static readonly ThreadLocal<int[]> m_DupedLayersTL = new(() => new int[256]);
private static readonly ThreadLocal<int> m_VersionTL = new();
public MobileIncomingSA(Mobile beholder, Mobile beheld) : base(0x78)
{
var m_Version = ++m_VersionTL.Value;
var m_DupedLayers = m_DupedLayersTL.Value;
var eq = beheld.Items;
var count = eq.Count;
if (beheld.HairItemID > 0)
{
count++;
}
if (beheld.FacialHairItemID > 0)
{
count++;
}
EnsureCapacity(23 + count * 9);
var hue = beheld.Hue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
Stream.Write(beheld.Serial);
Stream.Write((short)beheld.Body);
Stream.Write((short)beheld.X);
Stream.Write((short)beheld.Y);
Stream.Write((sbyte)beheld.Z);
Stream.Write((byte)beheld.Direction);
Stream.Write((short)hue);
Stream.Write((byte)beheld.GetPacketFlags());
Stream.Write((byte)Notoriety.Compute(beholder, beheld));
for (var i = 0; i < eq.Count; ++i)
{
var item = eq[i];
var layer = (byte)item.Layer;
if (!item.Deleted && beholder.CanSee(item) && m_DupedLayers[layer] != m_Version)
{
m_DupedLayers[layer] = m_Version;
hue = item.Hue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
var itemID = item.ItemID & 0x7FFF;
var writeHue = hue != 0;
if (writeHue)
if (!newPacket)
{
itemID |= 0x8000;
}
@ -761,11 +583,10 @@ namespace Server.Network
hue = beheld.SolidHueOverride;
}
var itemID = beheld.HairItemID & 0x7FFF;
var itemID = beheld.HairItemID & itemIdMask;
var writeHue = newPacket || hue != 0;
var writeHue = hue != 0;
if (writeHue)
if (!newPacket)
{
itemID |= 0x8000;
}
@ -793,158 +614,10 @@ namespace Server.Network
hue = beheld.SolidHueOverride;
}
var itemID = beheld.FacialHairItemID & 0x7FFF;
var itemID = beheld.FacialHairItemID & itemIdMask;
var writeHue = newPacket || hue != 0;
var writeHue = hue != 0;
if (writeHue)
{
itemID |= 0x8000;
}
Stream.Write(FacialHairInfo.FakeSerial(beheld));
Stream.Write((ushort)itemID);
Stream.Write((byte)Layer.FacialHair);
if (writeHue)
{
Stream.Write((short)hue);
}
}
}
Stream.Write(0); // terminate
}
}
// Pre-7.0.0.0 Mobile Incoming
public sealed class MobileIncomingOld : Packet
{
private static readonly ThreadLocal<int[]> m_DupedLayersTL = new(() => new int[256]);
private static readonly ThreadLocal<int> m_VersionTL = new();
public MobileIncomingOld(Mobile beholder, Mobile beheld) : base(0x78)
{
var m_Version = ++m_VersionTL.Value;
var m_DupedLayers = m_DupedLayersTL.Value;
var eq = beheld.Items;
var count = eq.Count;
if (beheld.HairItemID > 0)
{
count++;
}
if (beheld.FacialHairItemID > 0)
{
count++;
}
EnsureCapacity(23 + count * 9);
var hue = beheld.Hue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
Stream.Write(beheld.Serial);
Stream.Write((short)beheld.Body);
Stream.Write((short)beheld.X);
Stream.Write((short)beheld.Y);
Stream.Write((sbyte)beheld.Z);
Stream.Write((byte)beheld.Direction);
Stream.Write((short)hue);
Stream.Write((byte)beheld.GetOldPacketFlags());
Stream.Write((byte)Notoriety.Compute(beholder, beheld));
for (var i = 0; i < eq.Count; ++i)
{
var item = eq[i];
var layer = (byte)item.Layer;
if (!item.Deleted && beholder.CanSee(item) && m_DupedLayers[layer] != m_Version)
{
m_DupedLayers[layer] = m_Version;
hue = item.Hue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
var itemID = item.ItemID & 0x7FFF;
var writeHue = hue != 0;
if (writeHue)
{
itemID |= 0x8000;
}
Stream.Write(item.Serial);
Stream.Write((ushort)itemID);
Stream.Write(layer);
if (writeHue)
{
Stream.Write((short)hue);
}
}
}
if (beheld.HairItemID > 0)
{
if (m_DupedLayers[(int)Layer.Hair] != m_Version)
{
m_DupedLayers[(int)Layer.Hair] = m_Version;
hue = beheld.HairHue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
var itemID = beheld.HairItemID & 0x7FFF;
var writeHue = hue != 0;
if (writeHue)
{
itemID |= 0x8000;
}
Stream.Write(HairInfo.FakeSerial(beheld));
Stream.Write((ushort)itemID);
Stream.Write((byte)Layer.Hair);
if (writeHue)
{
Stream.Write((short)hue);
}
}
}
if (beheld.FacialHairItemID > 0)
{
if (m_DupedLayers[(int)Layer.FacialHair] != m_Version)
{
m_DupedLayers[(int)Layer.FacialHair] = m_Version;
hue = beheld.FacialHairHue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
var itemID = beheld.FacialHairItemID & 0x7FFF;
var writeHue = hue != 0;
if (writeHue)
if (!newPacket)
{
itemID |= 0x8000;
}