Major Inventory Refactor

Source/ACE.Server/Command/Handlers/AdminCommands.cs

@@ -1426,7 +1426,7 @@ public static void HandleMorph(Session session, params string[] parameters)
                     worldObject.PaletteTemplate = wearable.Palette;
                 if (wearable.Shade > 0)
                     worldObject.Shade = wearable.Shade;
-                player.TryEquipObject(worldObject, worldObject.GetProperty(PropertyInt.ValidLocations) ?? 0);
+                player.TryEquipObjectWithNetworking(worldObject, worldObject.GetProperty(PropertyInt.ValidLocations) ?? 0);
             }
 
             var containables = weenie.WeeniePropertiesCreateList.Where(x => x.DestinationType == (int)DestinationType.Contain || x.DestinationType == (int)DestinationType.Shop

Source/ACE.Server/Command/Handlers/DeveloperCommands.cs

@@ -912,14 +912,13 @@ private static void AddWeeniesToInventory(Session session, HashSet<uint> weenieI
                 if (loot == null) // weenie doesn't exist
                     continue;
 
-                if (stackSize == null)
-                    stackSize = loot.MaxStackSize;
+                var stackSizeForThisWeenieId = stackSize ?? loot.MaxStackSize;
 
-                if (stackSize > 1)
+                if (stackSizeForThisWeenieId > 1)
                 {
-                    loot.StackSize = stackSize;
-                    loot.EncumbranceVal = (loot.StackUnitEncumbrance ?? 0) * (stackSize ?? 1);
-                    loot.Value = (loot.StackUnitValue ?? 0) * (stackSize ?? 1);
+                    loot.StackSize = stackSizeForThisWeenieId;
+                    loot.EncumbranceVal = (loot.StackUnitEncumbrance ?? 0) * (stackSizeForThisWeenieId ?? 1);
+                    loot.Value = (loot.StackUnitValue ?? 0) * (stackSizeForThisWeenieId ?? 1);
                 }
 
                 session.Player.TryCreateInInventoryWithNetworking(loot);
@@ -929,7 +928,7 @@ private static void AddWeeniesToInventory(Session session, HashSet<uint> weenieI
         [CommandHandler("weapons", AccessLevel.Developer, CommandHandlerFlag.RequiresWorld, 0, "Creates testing items in your inventory.")]
         public static void HandleWeapons(Session session, params string[] parameters)
         {
-            HashSet<uint> weenieIds = new HashSet<uint> { 93, 127, 130, 148, 300, 307, 311, 326, 338, 348, 350, 7765, 12748, 12463, 31812 };
+            HashSet<uint> weenieIds = new HashSet<uint> { 93, 148, 300, 307, 311, 326, 338, 348, 350, 7765, 12748, 12463, 31812 };
 
             AddWeeniesToInventory(session, weenieIds);
         }

Source/ACE.Server/Entity/Actions/ActionChain.cs

@@ -132,19 +132,6 @@ public ActionChain AddDelaySeconds(double timeInSeconds)
             return this;
         }
 
-        public ActionChain AddDelayTicks(double timeInTicks)
-        {
-            if (Double.IsNaN(timeInTicks))
-            {
-                Console.WriteLine("WARNING: ActionChain.AddDelayTicks(" + timeInTicks + ")");
-                return this;
-            }
-
-            AddAction(WorldManager.DelayManager, new DelayAction(timeInTicks));
-
-            return this;
-        }
-
         public void EnqueueChain()
         {
             if (FirstElement != null)

Source/ACE.Server/Entity/AttackDamage.cs

@@ -37,7 +37,7 @@ public AttackDamage(WorldObject source, uint amount, bool criticalHit)
         /// <param name="source">The attacker to add up the damage for</param>
         public static ulong GetTotalDamage(List<AttackDamage> attacks, WorldObject source)
         {
-            return (ulong)attacks.Where(a => a.Source.Equals(source)).Sum(a => a.Amount);
+            return (ulong)attacks.Where(a => a.Source == source).Sum(a => a.Amount);
         }
 
         /// <summary>

Source/ACE.Server/Entity/Landblock.cs

@@ -14,6 +14,7 @@
 using ACE.DatLoader;
 using ACE.DatLoader.FileTypes;
 using ACE.Entity;
+using ACE.Entity.Enum;
 using ACE.Entity.Enum.Properties;
 using ACE.Server.Entity.Actions;
 using ACE.Server.Factories;
@@ -365,9 +366,9 @@ private void AddWorldObjectInternal(WorldObject wo)
             wo.NotifyPlayers();
         }
 
-        public void RemoveWorldObject(ObjectGuid objectId, bool adjacencyMove = false)
+        public void RemoveWorldObject(ObjectGuid objectId, bool adjacencyMove = false, bool fromPickup = false)
         {
-            RemoveWorldObjectInternal(objectId, adjacencyMove);
+            RemoveWorldObjectInternal(objectId, adjacencyMove, fromPickup);
         }
 
         /// <summary>
@@ -380,37 +381,7 @@ public void RemoveWorldObjectForPhysics(ObjectGuid objectId, bool adjacencyMove
             RemoveWorldObjectInternal(objectId, adjacencyMove);
         }
 
-        /// <summary>
-        /// This will also set the item.Location to null.
-        /// </summary>
-        public bool RemoveWorldObjectFromPickup(ObjectGuid objectGuid)
-        {
-            // Find owner of wo
-            var lb = GetOwner(objectGuid);
-
-            if (lb == null)
-            {
-                log.Error("Landblock QueueItemRemove failed to GetOwner");
-                return false;
-            }
-
-            var item = GetObject(objectGuid);
-
-            if (item == null)
-            {
-                log.Error("Landblock QueueItemRemove failed to GetObject");
-                return false;
-            }
-
-            RemoveWorldObjectInternal(objectGuid, true);
-            //item.PhysicsObj.DestroyObject();    // destroy physicsobj, but do not remove from tracking
-
-            item.Location = null;
-
-            return true;
-        }
-
-        private void RemoveWorldObjectInternal(ObjectGuid objectId, bool adjacencyMove = false)
+        private void RemoveWorldObjectInternal(ObjectGuid objectId, bool adjacencyMove = false, bool fromPickup = false)
         {
             //log.Debug($"LB {Id.Landblock:X}: removing {objectId.Full:X}");
 
@@ -427,7 +398,7 @@ private void RemoveWorldObjectInternal(ObjectGuid objectId, bool adjacencyMove =
             if (!adjacencyMove)
             {
                 // really remove it - send message to client to remove object
-                wo.EnqueueActionBroadcast((Player p) => p.RemoveTrackedObject(wo, true));
+                wo.EnqueueActionBroadcast(p => p.RemoveTrackedObject(wo, fromPickup));
 
                 wo.PhysicsObj.DestroyObject();
             }
@@ -502,12 +473,17 @@ public WorldObject GetObject(ObjectGuid guid)
         public WorldObject GetWieldedObject(ObjectGuid guid, bool searchAdjacents = true)
         {
             // search creature wielded items in current landblock
-            var creatures = worldObjects.Values.Where(wo => wo is Creature);
+            var creatures = worldObjects.Values.OfType<Creature>();
             foreach (var creature in creatures)
             {
-                var wieldedItem = ((Creature)creature).GetWieldedItem(guid);
+                var wieldedItem = creature.GetEquippedItem(guid);
                 if (wieldedItem != null)
-                    return wieldedItem;     // found it
+                {
+                    if ((wieldedItem.CurrentWieldedLocation & EquipMask.Selectable) != 0)
+                        return wieldedItem;
+
+                    return null;
+                }
             }
 
             // try searching adjacent landblocks if not found

Source/ACE.Server/Managers/EmoteManager.cs

@@ -214,7 +214,12 @@ public void ExecuteEmote(BiotaPropertiesEmote emoteSet, BiotaPropertiesEmoteActi
 
                 case EmoteType.DeleteSelf:
 
-                    WorldObject.Destroy();
+                    var destroyChain = new ActionChain();
+                    destroyChain.AddAction(WorldObject, () => WorldObject.ApplyVisualEffects(PlayScript.Destroy));
+                    destroyChain.AddDelaySeconds(3);
+                    destroyChain.AddAction(WorldObject, () => WorldObject.Destroy());
+                    destroyChain.EnqueueChain();
+
                     break;
 
                 case EmoteType.DirectBroadcast:
@@ -893,7 +898,7 @@ public void ExecuteEmote(BiotaPropertiesEmote emoteSet, BiotaPropertiesEmoteActi
                         item = WorldObjectFactory.CreateNewWorldObject((uint)emote.WeenieClassId);
                         if (item == null) break;
 
-                        success = player.TryRemoveItemFromInventoryWithNetworkingWithDestroy(item, (ushort)emote.Amount);
+                        success = player.TryConsumeFromInventoryWithNetworking(item, emote.Amount ?? 0);
                     }
                     break;
 

Source/ACE.Server/Managers/EmoteManagerExample.cs

@@ -602,7 +602,7 @@ public void Execute(Emote emote, WorldObject target)
                         item = WorldObjectFactory.CreateNewWorldObject(wcid);
                         if (item == null) break;
 
-                        var success = player.TryRemoveItemFromInventoryWithNetworkingWithDestroy(item, (ushort)emote.Amount);
+                        var success = player.TryConsumeFromInventoryWithNetworking(item, (int)emote.Amount);
                     }
                     break;
 

Source/ACE.Server/Managers/RecipeManager.cs

@@ -769,13 +769,15 @@ public static void DestroyItem(Player player, Recipe recipe, WorldObject item, u
         {
             if (item.OwnerId == player.Guid.Full || player.GetInventoryItem(item.Guid) != null)
             {
-                if (!player.TryRemoveItemFromInventoryWithNetworkingWithDestroy(item, (ushort)amount))
+                if (!player.TryConsumeFromInventoryWithNetworking(item, (int)amount))
                     log.Warn($"RecipeManager.DestroyItem({player.Name}, {item.Name}, {amount}, {msg}): failed to remove {item.Name}");
             }
             else if (item.WielderId == player.Guid.Full)
             {
-                if (!player.TryRemoveItemWithNetworking(item))
+                if (!player.TryDequipObjectWithNetworking(item.Guid, out _, Player.DequipObjectAction.ConsumeItem))
                     log.Warn($"RecipeManager.DestroyItem({player.Name}, {item.Name}, {amount}, {msg}): failed to remove {item.Name}");
+                else
+                    item.Destroy();
             }
             else
             {

Source/ACE.Server/Managers/WorldManager.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Net;
+using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -301,6 +302,15 @@ private static void DoPlayerEnterWorld(Session session, Character character, Bio
 
             session.SetPlayer(player);
 
+            // If the client is missing a location, we start them off in the starter dungeon
+            if (session.Player.Location == null)
+            {
+                if (session.Player.Instantiation != null)
+                    session.Player.Location = new Position(session.Player.Instantiation);
+                else
+                    session.Player.Location = new Position(2349072813, 12.3199f, -28.482f, 0.0049999995f, 0.0f, 0.0f, -0.9408059f, -0.3389459f);
+            }
+
             session.Player.PlayerEnterWorld();
 
             if (character.TotalLogins <= 1 || PropertyManager.GetBool("alwaysshowwelcome").Item)

Source/ACE.Server/Network/GameAction/Actions/GameActionGiveObjectRequest.cs

@@ -1,4 +1,5 @@
 using ACE.Entity;
+
 namespace ACE.Server.Network.GameAction.Actions
 {
     public static class GameActionGiveObjectRequest
@@ -8,7 +9,7 @@ public static void Handle(ClientMessage message, Session session)
         {
             uint targetID = message.Payload.ReadUInt32();
             uint objectID = message.Payload.ReadUInt32();
-            uint amount = message.Payload.ReadUInt32();
+            int amount = message.Payload.ReadInt32();
             ObjectGuid targetGuid = new ObjectGuid(targetID);
             ObjectGuid objectGuid = new ObjectGuid(objectID);
 

Source/ACE.Server/Network/GameAction/Actions/GameActionStackableSplitTo3D.cs

@@ -12,7 +12,7 @@ public static void Handle(ClientMessage message, Session session)
         {
             // Read in the applicable data.
             uint stackId    = message.Payload.ReadUInt32();
-            uint amount     = message.Payload.ReadUInt32();
+            int amount      = message.Payload.ReadInt32();
 
             session.Player.HandleActionStackableSplitTo3D(stackId, amount);
         }

Source/ACE.Server/Network/GameEvent/GameEventMessage.cs

@@ -15,7 +15,7 @@ protected GameEventMessage(GameEventType eventType, GameMessageGroup group, Sess
             Session = session;
 
             Writer.WriteGuid(session.Player.Guid);
-            var debugMessage = $"GameEventSequence Update - {eventType} - GameEventSequence was {session.GameEventSequence}";
+            //var debugMessage = $"GameEventSequence Update - {eventType} - GameEventSequence was {session.GameEventSequence}";
             Writer.Write(session.GameEventSequence++);
             //Console.WriteLine(debugMessage + $" and is now {session.GameEventSequence}");
             Writer.Write((uint)EventType);

Source/ACE.Server/Network/Managers/InboundMessageManager.cs

@@ -106,7 +106,7 @@ public static void HandleClientMessage(ClientMessage message, Session session)
             }
             else
             {
-                log.Warn($"Received unhandled fragment opcode: 0x{(uint)opcode:X}");
+                log.Warn($"Received unhandled fragment opcode: 0x{(int)opcode:X4} - {opcode}");
             }
         }
 
@@ -121,7 +121,7 @@ public static void HandleGameAction(GameActionType opcode, ClientMessage message
             }
             else
             {
-                log.Warn($"Received unhandled GameActionType: 0x{(uint)opcode:X}");
+                log.Warn($"Received unhandled GameActionType: 0x{(int)opcode:X4} - {opcode}");
             }
         }
     }