diff --git a/Projects/Server/Items/Container.cs b/Projects/Server/Items/Container.cs index eb12cb6b7..c1861d1e8 100644 --- a/Projects/Server/Items/Container.cs +++ b/Projects/Server/Items/Container.cs @@ -703,7 +703,7 @@ namespace Server.Items { for (var i = 0; i < Items.Count; ++i) { - Items[i].SendOPLPacketTo(to.NetState, true); + ns.SendOPLInfo(Items[i]); } } } diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs index e078aa692..acbc5cbcb 100644 --- a/Projects/Server/Items/Item.cs +++ b/Projects/Server/Items/Item.cs @@ -3094,44 +3094,44 @@ namespace Server public virtual int GetUpdateRange(Mobile m) => 18; - public virtual void SendInfoTo(NetState ns, ReadOnlySpan world, Span opl) + public virtual void SendInfoTo(NetState ns, ReadOnlySpan world = default, Span opl = default) { - if (opl != null && opl[0] == 0) - { - OutgoingEntityPackets.CreateOPLInfo(opl, this); - } - SendWorldPacketTo(ns, world); SendOPLPacketTo(ns, opl); } - public void SendInfoTo(NetState ns) => SendInfoTo(ns, ObjectPropertyList.Enabled); - - public virtual void SendInfoTo(NetState ns, bool sendOplPacket) + public void SendOPLPacketTo(NetState ns, Span opl = default) { - SendWorldPacketTo(ns); - SendOPLPacketTo(ns, sendOplPacket); - } + if (!ObjectPropertyList.Enabled) + { + return; + } - public void SendOPLPacketTo(NetState ns) => SendOPLPacketTo(ns, ObjectPropertyList.Enabled); - - public virtual void SendOPLPacketTo(NetState ns, bool sendOplPacket) - { - if (sendOplPacket) + if (opl == null) { ns.SendOPLInfo(this); + return; } + + if (opl[0] == 0) + { + OutgoingEntityPackets.CreateOPLInfo(opl, this); + } + + ns.Send(opl); } - public virtual void SendOPLPacketTo(NetState ns, ReadOnlySpan opl) + public virtual void SendWorldPacketTo(NetState ns, ReadOnlySpan 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 world) => ns?.Send(world); - public virtual int GetTotal(TotalType type) => 0; public virtual void UpdateTotal(Item sender, TotalType type, int delta) diff --git a/Projects/UOContent/Items/Misc/Blocker.cs b/Projects/UOContent/Items/Misc/Blocker.cs index d09b9bfde..5acbb6cd9 100644 --- a/Projects/UOContent/Items/Misc/Blocker.cs +++ b/Projects/UOContent/Items/Misc/Blocker.cs @@ -17,7 +17,7 @@ namespace Server.Items public override int LabelNumber => 503057; // Impassable! - public override void SendWorldPacketTo(NetState ns, ReadOnlySpan world) + public override void SendWorldPacketTo(NetState ns, ReadOnlySpan world = default) { var mob = ns.Mobile; if (AccessLevel.GameMaster >= mob?.AccessLevel) @@ -29,18 +29,6 @@ namespace Server.Items 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) { // GM Packet diff --git a/Projects/UOContent/Items/Misc/Corpses/Corpse.cs b/Projects/UOContent/Items/Misc/Corpses/Corpse.cs index c8593bcc8..669a07280 100644 --- a/Projects/UOContent/Items/Misc/Corpses/Corpse.cs +++ b/Projects/UOContent/Items/Misc/Corpses/Corpse.cs @@ -815,16 +815,6 @@ namespace Server.Items 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 world, Span opl) { base.SendInfoTo(ns, world, opl); diff --git a/Projects/UOContent/Items/Misc/LOSBlocker.cs b/Projects/UOContent/Items/Misc/LOSBlocker.cs index 0d3bcc126..46b4126d4 100644 --- a/Projects/UOContent/Items/Misc/LOSBlocker.cs +++ b/Projects/UOContent/Items/Misc/LOSBlocker.cs @@ -23,7 +23,7 @@ namespace Server.Items TileData.ItemTable[0x21A2].Height = 20; } - public override void SendWorldPacketTo(NetState ns, ReadOnlySpan world) + public override void SendWorldPacketTo(NetState ns, ReadOnlySpan world = default) { var mob = ns.Mobile; if (AccessLevel.GameMaster >= mob?.AccessLevel) @@ -35,18 +35,6 @@ namespace Server.Items 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) { // GM Packet diff --git a/Projects/UOContent/Multis/HouseFoundation.cs b/Projects/UOContent/Multis/HouseFoundation.cs index fd05b69ad..8c191ab54 100644 --- a/Projects/UOContent/Multis/HouseFoundation.cs +++ b/Projects/UOContent/Multis/HouseFoundation.cs @@ -880,19 +880,11 @@ namespace Server.Multis DesignState.SendDetailedInfoTo(ns); } - public override void SendInfoTo(NetState ns, bool sendOplPacket) - { - base.SendInfoTo(ns, sendOplPacket); - - var stateToSend = DesignContext.Find(ns.Mobile)?.Foundation == this ? DesignState : CurrentState; - stateToSend.SendGeneralInfoTo(ns); - } - - public override void SendInfoTo(NetState ns, ReadOnlySpan world, Span opl) + public override void SendInfoTo(NetState ns, ReadOnlySpan world = default, Span opl = default) { 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); }