From db207227114a7051d8addaa4d282600119330c28 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sun, 12 Jun 2022 21:27:16 -0700
Subject: [PATCH] fix: Simplifies OPL (#1051)

---
 Projects/Server/Items/Item.cs                 | 24 ++++++-------------
 Projects/Server/Mobiles/Mobile.cs             | 11 ++-------
 .../UOContent/Engines/Plants/PlantItem.cs     |  2 +-
 .../UOContent/Items/Misc/Corpses/Corpse.cs    |  4 ++--
 .../Multis/Houses/HouseFoundation.cs          |  4 ++--
 5 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs
index 9a657dc21..027ce41ba 100644
--- a/Projects/Server/Items/Item.cs
+++ b/Projects/Server/Items/Item.cs
@@ -1123,7 +1123,6 @@ namespace Server
                     Span<byte> oldWorldItem = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket();
                     Span<byte> saWorldItem = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket();
                     Span<byte> hsWorldItem = stackalloc byte[OutgoingEntityPackets.MaxWorldEntityPacketLength].InitializePacket();
-                    Span<byte> opl = ObjectPropertyList.Enabled ? stackalloc byte[OutgoingEntityPackets.OPLPacketLength].InitializePacket() : null;
 
                     var eable = m_Map.GetClientsInRange(m_Location, GetMaxUpdateRange());
 
@@ -1141,7 +1140,7 @@ namespace Server
                                     hsWorldItem = hsWorldItem[..length];
                                 }
 
-                                SendInfoTo(state, hsWorldItem, opl);
+                                SendInfoTo(state, hsWorldItem);
                             }
                             else if (state.StygianAbyss)
                             {
@@ -1151,7 +1150,7 @@ namespace Server
                                     saWorldItem = saWorldItem[..length];
                                 }
 
-                                SendInfoTo(state, saWorldItem, opl);
+                                SendInfoTo(state, saWorldItem);
                             }
                             else
                             {
@@ -1161,7 +1160,7 @@ namespace Server
                                     oldWorldItem = oldWorldItem[..length];
                                 }
 
-                                SendInfoTo(state, oldWorldItem, opl);
+                                SendInfoTo(state, oldWorldItem);
                             }
                         }
                     }
@@ -3073,27 +3072,18 @@ namespace Server
 
         public virtual int GetUpdateRange(Mobile m) => 18;
 
-        public virtual void SendInfoTo(NetState ns, ReadOnlySpan<byte> world = default, Span<byte> opl = default)
+        public virtual void SendInfoTo(NetState ns, ReadOnlySpan<byte> world = default)
         {
             SendWorldPacketTo(ns, world);
-            SendOPLPacketTo(ns, opl);
+            SendOPLPacketTo(ns);
         }
 
-        public virtual void SendOPLPacketTo(NetState ns, Span<byte> opl = default)
+        public virtual void SendOPLPacketTo(NetState ns)
         {
-            if (!ObjectPropertyList.Enabled)
-            {
-                return;
-            }
-
-            if (opl == null)
+            if (ObjectPropertyList.Enabled)
             {
                 ns.SendOPLInfo(this);
-                return;
             }
-
-            OutgoingEntityPackets.CreateOPLInfo(opl, this);
-            ns.Send(opl);
         }
 
         public virtual void SendWorldPacketTo(NetState ns, ReadOnlySpan<byte> world = default)
diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs
index 76a307d15..7fb9e0a77 100644
--- a/Projects/Server/Mobiles/Mobile.cs
+++ b/Projects/Server/Mobiles/Mobile.cs
@@ -6892,21 +6892,14 @@ namespace Server
             eable.Free();
         }
 
-        public void SendOPLPacketTo(NetState state) => SendOPLPacketTo(state, ObjectPropertyList.Enabled);
-
-        protected virtual void SendOPLPacketTo(NetState ns, bool sendOplPacket)
+        public virtual void SendOPLPacketTo(NetState ns)
         {
-            if (sendOplPacket)
+            if (ObjectPropertyList.Enabled)
             {
                 ns.SendOPLInfo(this);
             }
         }
 
-        public virtual void SendOPLPacketTo(NetState ns, ReadOnlySpan<byte> opl)
-        {
-            ns?.Send(opl);
-        }
-
         public virtual void OnAccessLevelChanged(AccessLevel oldLevel)
         {
         }
diff --git a/Projects/UOContent/Engines/Plants/PlantItem.cs b/Projects/UOContent/Engines/Plants/PlantItem.cs
index ba71e6455..ef1bcdcb1 100644
--- a/Projects/UOContent/Engines/Plants/PlantItem.cs
+++ b/Projects/UOContent/Engines/Plants/PlantItem.cs
@@ -258,7 +258,7 @@ namespace Server.Engines.Plants
         }
 
         // Overridden to support new and old client localization
-        public override void SendOPLPacketTo(NetState ns, Span<byte> opl = default)
+        public override void SendOPLPacketTo(NetState ns)
         {
             if (!ObjectPropertyList.Enabled)
             {
diff --git a/Projects/UOContent/Items/Misc/Corpses/Corpse.cs b/Projects/UOContent/Items/Misc/Corpses/Corpse.cs
index 15eb2ca25..17f686976 100644
--- a/Projects/UOContent/Items/Misc/Corpses/Corpse.cs
+++ b/Projects/UOContent/Items/Misc/Corpses/Corpse.cs
@@ -799,9 +799,9 @@ namespace Server.Items
             return m_Devourer.Devour(this); // Devour the corpse if it hasn't
         }
 
-        public override void SendInfoTo(NetState ns, ReadOnlySpan<byte> world = default, Span<byte> opl = default)
+        public override void SendInfoTo(NetState ns, ReadOnlySpan<byte> world = default)
         {
-            base.SendInfoTo(ns, world, opl);
+            base.SendInfoTo(ns, world);
 
             if (((Body)Amount).IsHuman && ItemID == 0x2006)
             {
diff --git a/Projects/UOContent/Multis/Houses/HouseFoundation.cs b/Projects/UOContent/Multis/Houses/HouseFoundation.cs
index d8c1a7176..186952f38 100644
--- a/Projects/UOContent/Multis/Houses/HouseFoundation.cs
+++ b/Projects/UOContent/Multis/Houses/HouseFoundation.cs
@@ -878,9 +878,9 @@ namespace Server.Multis
             DesignState.SendDetailedInfoTo(ns);
         }
 
-        public override void SendInfoTo(NetState ns, ReadOnlySpan<byte> world = default, Span<byte> opl = default)
+        public override void SendInfoTo(NetState ns, ReadOnlySpan<byte> world = default)
         {
-            base.SendInfoTo(ns, world, opl);
+            base.SendInfoTo(ns, world);
 
             var stateToSend = DesignContext.Find(ns?.Mobile)?.Foundation == this ? DesignState : CurrentState;
             stateToSend.SendGeneralInfoTo(ns);