Parsing incoming network commands should not instantiate ObjectGuids

Source/ACE.Entity/ObjectGuid.cs

@@ -33,6 +33,10 @@ public struct ObjectGuid
         public static uint DynamicMin { get; } = 0x80000000;
         public static uint DynamicMax { get; } = 0xFFFFFFFE; // Ends at E because uint.Max is reserved for "invalid"
 
+        public static bool IsPlayer(uint guid) { return (guid >= PlayerMin && guid <= PlayerMax); }
+        public static bool IsStatic(uint guid) { return (guid >= StaticObjectMin && guid <= StaticObjectMax); }
+        public static bool IsDynamic(uint guid) { return (guid >= DynamicMin && guid <= DynamicMax); }
+
         public uint Full { get; }
         public uint Low => Full & 0xFFFFFF;
         public uint High => (Full >> 24);
@@ -42,11 +46,11 @@ public ObjectGuid(uint full)
         {
             Full = full;
 
-            if (Full >= PlayerMin && Full <= PlayerMax)
+            if (IsPlayer(full))
                 Type = GuidType.Player;
-            else if (Full >= StaticObjectMin && Full <= StaticObjectMax)
+            else if (IsStatic(full))
                 Type = GuidType.Static;
-            else if (Full >= DynamicMin && Full <= DynamicMax)
+            else if (IsDynamic(full))
                 Type = GuidType.Dynamic;
             else
                 Type = GuidType.Undef;

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

@@ -399,7 +399,7 @@ public static void MoveTo(Session session, params string[] parameters)
             WorldObject loot = WorldObjectFactory.CreateNewWorldObject(trainingWandTarget);
             LootGenerationFactory.Spawn(loot, session.Player.Location.InFrontOf(distance));
 
-            session.Player.HandleActionPutItemInContainer(loot.Guid, session.Player.Guid);
+            session.Player.HandleActionPutItemInContainer(loot.Guid.Full, session.Player.Guid.Full);
         }
 
         /// <summary>

Source/ACE.Server/Entity/ItemProfile.cs

@@ -1,11 +1,11 @@
-using ACE.Entity;
+using ACE.Entity;
 
 namespace ACE.Server.Entity
 {
     public class ItemProfile
     {
         public uint Amount;
-        public ObjectGuid Guid;
+        public uint ObjectGuid;
         public uint WeenieClassId;
     }
 }

Source/ACE.Server/Entity/Landblock.cs

@@ -467,6 +467,11 @@ public WorldObject GetObject(ObjectGuid guid)
             return null;
         }
 
+        public WorldObject GetWieldedObject(uint objectGuid, bool searchAdjacents = true)
+        {
+            return GetWieldedObject(new ObjectGuid(objectGuid), searchAdjacents); // todo fix
+        }
+
         /// <summary>
         /// Searches this landblock (and possibly adjacents) for an ObjectGuid wielded by a creature
         /// </summary>

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

@@ -1,3 +1,4 @@
+
 namespace ACE.Server.Network.GameAction.Actions
 {
     /// <summary>

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

@@ -1,5 +1,3 @@
-using ACE.Entity;
-using ACE.Server.Managers;
 
 namespace ACE.Server.Network.GameAction.Actions
 {

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

@@ -8,6 +8,7 @@ public static class GameActionAddChannel
         public static void Handle(ClientMessage message, Session session)
         {
             var chatChannelID = (Channel)message.Payload.ReadUInt32();
+
             // Probably need some IsAdvocate and IsSentinel type thing going on here as well. leaving for now
             if (!session.Player.IsAdmin && !session.Player.IsArch && !session.Player.IsPsr)
                 return;

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

@@ -1,4 +1,3 @@
-using System;
 using ACE.Server.Network.Structure;
 
 namespace ACE.Server.Network.GameAction.Actions

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

@@ -1,3 +1,4 @@
+
 namespace ACE.Server.Network.GameAction.Actions
 {
     public static class GameActionAddSpellFavorite

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

@@ -1,5 +1,3 @@
-using ACE.Entity;
-using ACE.Server.Network.GameEvent.Events;
 
 namespace ACE.Server.Network.GameAction.Actions
 {
@@ -8,10 +6,10 @@ public static class GameActionAddToTrade
         [GameAction(GameActionType.AddToTrade)]
         public static void Handle(ClientMessage message, Session session)
         {
-            ObjectGuid item = new ObjectGuid(message.Payload.ReadUInt32());
-            uint tradeSlot = message.Payload.ReadUInt32();
+            var itemGuid = message.Payload.ReadUInt32();
+            var tradeSlot = message.Payload.ReadUInt32();
 
-            session.Player.HandleActionAddToTrade(session, item, tradeSlot);
+            session.Player.HandleActionAddToTrade(session, itemGuid, tradeSlot);
         }
     }
 }

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

@@ -1,8 +1,10 @@
-using System;
+using System;
+
 using ACE.Common.Extensions;
 using ACE.Entity.Enum;
 using ACE.Server.Entity;
 using ACE.Server.Physics.Common;
+
 using Position = ACE.Entity.Position;
 
 namespace ACE.Server.Network.GameAction.Actions

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

@@ -1,4 +1,3 @@
-using ACE.Entity;
 
 namespace ACE.Server.Network.GameAction.Actions
 {
@@ -7,8 +6,7 @@ public static class GameActionAllegianceBreakAllegiance
         [GameAction(GameActionType.BreakAllegiance)]
         public static void Handle(ClientMessage message, Session session)
         {
-            var target = message.Payload.ReadUInt32();
-            var targetGuid = new ObjectGuid(target);
+            var targetGuid = message.Payload.ReadUInt32();
 
             session.Player.HandleActionBreakAllegiance(targetGuid);
         }

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

@@ -1,4 +1,3 @@
-using ACE.Entity;
 
 namespace ACE.Server.Network.GameAction.Actions
 {
@@ -7,8 +6,7 @@ public static class GameActionAllegianceSwearAllegiance
         [GameAction(GameActionType.SwearAllegiance)]
         public static void Handle(ClientMessage message, Session session)
         {
-            var target = message.Payload.ReadUInt32();
-            var targetGuid = new ObjectGuid(target);
+            var targetGuid = message.Payload.ReadUInt32();
 
             session.Player.HandleActionSwearAllegiance(targetGuid);
         }

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

@@ -1,4 +1,5 @@
 using System;
+
 using ACE.Server.Network.GameEvent.Events;
 
 namespace ACE.Server.Network.GameAction.Actions

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

@@ -1,4 +1,5 @@
 using System;
+
 using ACE.Entity;
 
 namespace ACE.Server.Network.GameAction.Actions

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

@@ -1,4 +1,3 @@
-using ACE.Entity;
 
 namespace ACE.Server.Network.GameAction.Actions
 {
@@ -7,12 +6,10 @@ public static class GameActionBookPageData
         [GameAction(GameActionType.BookPageData)]
         public static void Handle(ClientMessage message, Session session)
         {
-            var objectId = message.Payload.ReadUInt32();
+            var bookGuid = message.Payload.ReadUInt32();
             var pageNum = message.Payload.ReadUInt32();
 
-            ObjectGuid guid = new ObjectGuid(objectId);
-
-            session.Player.ReadBookPage(guid, pageNum);
+            session.Player.ReadBookPage(bookGuid, pageNum);
         }
     }
 }

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

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using ACE.Entity;
+
 using ACE.Server.Entity;
 
 namespace ACE.Server.Network.GameAction.Actions
@@ -9,7 +9,7 @@ public static class GameActionBuyItems
         [GameAction(GameActionType.Buy)]
         public static void Handle(ClientMessage message, Session session)
         {
-            ObjectGuid vendorId = new ObjectGuid(message.Payload.ReadUInt32());
+            var vendorGuid = message.Payload.ReadUInt32();
 
             uint itemcount = message.Payload.ReadUInt32();
 
@@ -22,15 +22,15 @@ public static void Handle(ClientMessage message, Session session)
                 item.Amount = message.Payload.ReadUInt32();
                 // item.Amount = item.Amount & 0xFFFFFF;
 
-                item.Guid = message.Payload.ReadGuid();
+                item.ObjectGuid = message.Payload.ReadUInt32();
                 items.Add(item);
             }
 
             // curancy 0 default, if else then currancy is set other then money
             uint i_alternateCurrencyID = message.Payload.ReadUInt32();
 
             // todo: take into account other currencyIds other then assuming default
-            session.Player.HandleActionBuyItem(vendorId, items);
+            session.Player.HandleActionBuyItem(vendorGuid, items);
         }
     }
 }

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

@@ -14,6 +14,7 @@ public static void Handle(ClientMessage clientMessage, Session session)
         {
             var groupChatType = (Channel)clientMessage.Payload.ReadUInt32();
             var message = clientMessage.Payload.ReadString16L();
+
             switch (groupChatType)
             {
                 case Channel.Abuse:

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

@@ -16,7 +16,6 @@ public static void Handle(ClientMessage message, Session session)
                 //Close the trade window for the trade partner
                 target.HandleActionCloseTradeNegotiations(target.Session);
             }
-
         }
     }
 }

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

@@ -1,26 +1,21 @@
 using System.Collections.Generic;
 
-using ACE.Entity;
-using ACE.Server.Entity;
-
 namespace ACE.Server.Network.GameAction.Actions
 {
     public static class GameActionCreateTinkeringTool
     {
         [GameAction(GameActionType.CreateTinkeringTool)]
         public static void Handle(ClientMessage message, Session session)
         {
-            ObjectGuid vendorId = new ObjectGuid(message.Payload.ReadUInt32());
+            var vendorGuid = message.Payload.ReadUInt32();
             uint itemcount = message.Payload.ReadUInt32();
 
-            List<ObjectGuid> items = new List<ObjectGuid>();
+            var items = new List<uint>();
 
             while (itemcount > 0)
             {
                 itemcount--;
-                ObjectGuid item = new ObjectGuid();
-                item = new ObjectGuid(message.Payload.ReadUInt32());
-                items.Add(item);
+                items.Add(message.Payload.ReadUInt32());
             }
 
             session.Player.HandleTinkeringTool(items);

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

@@ -1,4 +1,3 @@
-using ACE.Server.Managers;
 
 namespace ACE.Server.Network.GameAction.Actions
 {
@@ -7,7 +6,7 @@ public static class GameActionDeclineTrade
         [GameAction(GameActionType.DeclineTrade)]
         public static void Handle(ClientMessage message, Session session)
         {
-               session.Player.HandleActionDeclineTrade(session);
+            session.Player.HandleActionDeclineTrade(session);
         }
     }
 }

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

@@ -1,3 +1,4 @@
+
 namespace ACE.Server.Network.GameAction.Actions
 {
     // Death feels is less morbid then suicide as a human, used "Die" instead.

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

@@ -1,3 +1,4 @@
+
 namespace ACE.Server.Network.GameAction.Actions
 {
     public static class GameActionDisplayPlayerConsentList

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

@@ -1,4 +1,3 @@
-using ACE.Entity;
 
 namespace ACE.Server.Network.GameAction.Actions
 {
@@ -8,9 +7,9 @@ public static class GameActionDropItem
 
         public static void Handle(ClientMessage message, Session session)
         {
-            var objectGuid = new ObjectGuid(message.Payload.ReadUInt32());
+            var itemGuid = message.Payload.ReadUInt32();
 
-            session.Player.HandleActionDropItem(objectGuid);
+            session.Player.HandleActionDropItem(itemGuid);
         }
     }
 }

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

@@ -1,6 +1,6 @@
+
 namespace ACE.Server.Network.GameAction.Actions
 {
-
     public static class GameActionFellowshipChangeOpenness
     {
         [GameAction(GameActionType.FellowshipChangeOpenness)]

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

@@ -1,6 +1,5 @@
 using ACE.Common.Extensions;
 using ACE.Server.Network.GameEvent.Events;
-using ACE.Server.Network.GameMessages.Messages;
 
 namespace ACE.Server.Network.GameAction.Actions
 {

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

@@ -1,3 +1,4 @@
+
 namespace ACE.Server.Network.GameAction.Actions
 {
     public class GameActionFellowshipQuit

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

@@ -1,5 +1,3 @@
-using ACE.Entity;
-using ACE.Server.WorldObjects;
 using ACE.Server.Managers;
 
 namespace ACE.Server.Network.GameAction.Actions
@@ -9,9 +7,8 @@ public static class GameActionFellowshipRecruit
         [GameAction(GameActionType.FellowshipRecruit)]
         public static void Handle(ClientMessage message, Session session)
         {
-            uint newMemberId = message.Payload.ReadUInt32();
-            ObjectGuid newMember = new ObjectGuid(newMemberId);
-            Player newPlayer = PlayerManager.GetOnlinePlayer(newMemberId);
+            uint newMemberGuid = message.Payload.ReadUInt32();
+            var newPlayer = PlayerManager.GetOnlinePlayer(newMemberGuid);
 
             session.Player.FellowshipRecruit(newPlayer);
         }

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

@@ -7,14 +7,11 @@ public static class GameActionGameJoin
         [GameAction(GameActionType.Join)]
         public static void Handle(ClientMessage message, Session session)
         {
-            var gameId = message.Payload.ReadGuid(); // object id of gameboard
+            var gameGuid = message.Payload.ReadUInt32(); // object id of gameboard
             var whichTeam = message.Payload.ReadUInt32(); // expecting 0xFFFFFFFF here
 
-            Game wo = session.Player.CurrentLandblock?.GetObject(gameId) as Game;
-            if (wo != null)
-            {
-                wo.ActOnJoin(session.Player.Guid);
-            }
+            if (session.Player.CurrentLandblock?.GetObject(gameGuid) is Game game)
+                game.ActOnJoin(session.Player.Guid);
         }
     }
 }

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

@@ -1,3 +1,4 @@
+
 namespace ACE.Server.Network.GameAction.Actions
 {
     public static class GameActionGameQuit

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

@@ -1,3 +1,4 @@
+
 namespace ACE.Server.Network.GameAction.Actions
 {
     public static class GameActionGetAndWieldItem

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

@@ -1,4 +1,3 @@
-using ACE.Entity;
 
 namespace ACE.Server.Network.GameAction.Actions
 {
@@ -7,11 +6,9 @@ public static class GameActionGiveObjectRequest
         [GameAction(GameActionType.GiveObjectRequest)]
         public static void Handle(ClientMessage message, Session session)
         {
-            uint targetID = message.Payload.ReadUInt32();
-            uint objectID = message.Payload.ReadUInt32();
+            uint targetGuid = message.Payload.ReadUInt32();
+            uint objectGuid = message.Payload.ReadUInt32();
             int amount = message.Payload.ReadInt32();
-            ObjectGuid targetGuid = new ObjectGuid(targetID);
-            ObjectGuid objectGuid = new ObjectGuid(objectID);
 
             session.Player.HandleActionGiveObjectRequest(targetGuid, objectGuid, amount);
         }

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

@@ -1,4 +1,5 @@
 using System;
+
 using ACE.Server.Network.GameEvent.Events;
 
 namespace ACE.Server.Network.GameAction.Actions