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

fix(core): Cleans up OPL code (#396)

Browse source 
- [X] Cleans up OPL code to simplify the calls
This commit is contained in:
Kamron Batman 2021-01-09 11:56:05 -08:00 • committed by GitHub
parent 5882b1ab3f
commit 0b9fb9c071
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server/Items/Container.cs
View file

@ -703,7 +703,7 @@ namespace Server.Items
{ {
for (var i = 0; i < Items.Count; ++i) for (var i = 0; i < Items.Count; ++i)
{ {
Items[i].SendOPLPacketTo(to.NetState, true); ns.SendOPLInfo(Items[i]);
} }
} }
} }

46
Projects/Server/Items/Item.cs
View file

@ -3094,44 +3094,44 @@ namespace Server
public virtual int GetUpdateRange(Mobile m) => 18; public virtual int GetUpdateRange(Mobile m) => 18;
public virtual void SendInfoTo(NetState ns, ReadOnlySpan<byte> world, Span<byte> opl) public virtual void SendInfoTo(NetState ns, ReadOnlySpan<byte> world = default, Span<byte> opl = default)
{ {
if (opl != null && opl[0] == 0)
{
OutgoingEntityPackets.CreateOPLInfo(opl, this);
}
SendWorldPacketTo(ns, world); SendWorldPacketTo(ns, world);
SendOPLPacketTo(ns, opl); SendOPLPacketTo(ns, opl);
} }
public void SendInfoTo(NetState ns) => SendInfoTo(ns, ObjectPropertyList.Enabled); public void SendOPLPacketTo(NetState ns, Span<byte> opl = default)
public virtual void SendInfoTo(NetState ns, bool sendOplPacket)
{ {
SendWorldPacketTo(ns); if (!ObjectPropertyList.Enabled)
SendOPLPacketTo(ns, sendOplPacket); {
} return;
}
public void SendOPLPacketTo(NetState ns) => SendOPLPacketTo(ns, ObjectPropertyList.Enabled); if (opl == null)
public virtual void SendOPLPacketTo(NetState ns, bool sendOplPacket)
{
if (sendOplPacket)
{ {
ns.SendOPLInfo(this); ns.SendOPLInfo(this);
return;
} }
if (opl[0] == 0)
{
OutgoingEntityPackets.CreateOPLInfo(opl, this);
}
ns.Send(opl);
} }
public virtual void SendOPLPacketTo(NetState ns, ReadOnlySpan<byte> opl) public virtual void SendWorldPacketTo(NetState ns, ReadOnlySpan<byte> world = default)
{ {
ns?.Send(opl); if (world != null)
{
ns?.Send(world);
return;
}
ns.SendWorldItem(this);
} }
protected virtual void SendWorldPacketTo(NetState ns) => ns.SendWorldItem(this);
public virtual void SendWorldPacketTo(NetState ns, ReadOnlySpan<byte> world) => ns?.Send(world);
public virtual int GetTotal(TotalType type) => 0; public virtual int GetTotal(TotalType type) => 0;
public virtual void UpdateTotal(Item sender, TotalType type, int delta) public virtual void UpdateTotal(Item sender, TotalType type, int delta)

14
Projects/UOContent/Items/Misc/Blocker.cs
View file

@ -17,7 +17,7 @@ namespace Server.Items
public override int LabelNumber => 503057; // Impassable! public override int LabelNumber => 503057; // Impassable!
public override void SendWorldPacketTo(NetState ns, ReadOnlySpan<byte> world) public override void SendWorldPacketTo(NetState ns, ReadOnlySpan<byte> world = default)
{ {
var mob = ns.Mobile; var mob = ns.Mobile;
if (AccessLevel.GameMaster >= mob?.AccessLevel) if (AccessLevel.GameMaster >= mob?.AccessLevel)
@ -29,18 +29,6 @@ namespace Server.Items
SendGMItem(ns); SendGMItem(ns);
} }
protected override void SendWorldPacketTo(NetState ns)
{
var mob = ns.Mobile;
if (AccessLevel.GameMaster >= mob?.AccessLevel)
{
base.SendWorldPacketTo(ns);
return;
}
SendGMItem(ns);
}
private void SendGMItem(NetState ns) private void SendGMItem(NetState ns)
{ {
// GM Packet // GM Packet

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

@ -815,16 +815,6 @@ namespace Server.Items
ns.Send(new CorpseEquip(ns.Mobile, this)); ns.Send(new CorpseEquip(ns.Mobile, this));
} }
public override void SendInfoTo(NetState ns, bool sendOplPacket)
{
base.SendInfoTo(ns, sendOplPacket);
if (((Body)Amount).IsHuman && ItemID == 0x2006)
{
SendCorpseContent(ns);
}
}
public override void SendInfoTo(NetState ns, ReadOnlySpan<byte> world, Span<byte> opl) public override void SendInfoTo(NetState ns, ReadOnlySpan<byte> world, Span<byte> opl)
{ {
base.SendInfoTo(ns, world, opl); base.SendInfoTo(ns, world, opl);

14
Projects/UOContent/Items/Misc/LOSBlocker.cs
View file

@ -23,7 +23,7 @@ namespace Server.Items
TileData.ItemTable[0x21A2].Height = 20; TileData.ItemTable[0x21A2].Height = 20;
} }
public override void SendWorldPacketTo(NetState ns, ReadOnlySpan<byte> world) public override void SendWorldPacketTo(NetState ns, ReadOnlySpan<byte> world = default)
{ {
var mob = ns.Mobile; var mob = ns.Mobile;
if (AccessLevel.GameMaster >= mob?.AccessLevel) if (AccessLevel.GameMaster >= mob?.AccessLevel)
@ -35,18 +35,6 @@ namespace Server.Items
SendGMItem(ns); SendGMItem(ns);
} }
protected override void SendWorldPacketTo(NetState ns)
{
var mob = ns.Mobile;
if (AccessLevel.GameMaster >= mob?.AccessLevel)
{
base.SendWorldPacketTo(ns);
return;
}
SendGMItem(ns);
}
private void SendGMItem(NetState ns) private void SendGMItem(NetState ns)
{ {
// GM Packet // GM Packet

12
Projects/UOContent/Multis/HouseFoundation.cs
View file

@ -880,19 +880,11 @@ namespace Server.Multis
DesignState.SendDetailedInfoTo(ns); DesignState.SendDetailedInfoTo(ns);
} }
public override void SendInfoTo(NetState ns, bool sendOplPacket) public override void SendInfoTo(NetState ns, ReadOnlySpan<byte> world = default, Span<byte> opl = default)
{
base.SendInfoTo(ns, sendOplPacket);
var stateToSend = DesignContext.Find(ns.Mobile)?.Foundation == this ? DesignState : CurrentState;
stateToSend.SendGeneralInfoTo(ns);
}
public override void SendInfoTo(NetState ns, ReadOnlySpan<byte> world, Span<byte> opl)
{ {
base.SendInfoTo(ns, world, opl); base.SendInfoTo(ns, world, opl);
var stateToSend = DesignContext.Find(ns.Mobile)?.Foundation == this ? DesignState : CurrentState; var stateToSend = DesignContext.Find(ns?.Mobile)?.Foundation == this ? DesignState : CurrentState;
stateToSend.SendGeneralInfoTo(ns); stateToSend.SendGeneralInfoTo(ns);
} }