R63 Inventory Fixed!

Status
Not open for further replies.
did i do this right...:
InventoryComponent.cs
PHP:
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Data;

using Uber.Messages;
using Uber.HabboHotel.Pets;
using Uber.HabboHotel.GameClients;
using Uber.HabboHotel.Items;
using Uber.Storage;

namespace Uber.HabboHotel.Users.Inventory
{
    class InventoryComponent
    {
        private List<UserItem> InventoryItems;
        private List<Pet> InventoryPets;
        public uint UserId;

        public int ItemCount
        {
            get
            {
                return InventoryItems.Count;
            }
        }

        public int PetCount
        {
            get
            {
                return InventoryPets.Count;
            }
        }

        public InventoryComponent(uint UserId)
        {
            this.UserId = UserId;
            this.InventoryItems = new List<UserItem>();
            this.InventoryPets = new List<Pet>();
        }

        public void ClearItems()
        {
            using (DatabaseClient dbClient = UberEnvironment.GetDatabase().GetClient())
            {
                dbClient.AddParamWithValue("userid", UserId);
                dbClient.ExecuteQuery("DELETE FROM user_items WHERE user_id = @userid");
            }

            UpdateItems(true);
        }

        public void ClearPets()
        {
            using (DatabaseClient dbClient = UberEnvironment.GetDatabase().GetClient())
            {
                dbClient.AddParamWithValue("userid", UserId);
                dbClient.ExecuteQuery("DELETE FROM user_pets WHERE user_id = @userid AND room_id = 0");
            }

            UpdatePets(true);
        }

        public void LoadInventory()
        {
            using (TimedLock.Lock(this.InventoryItems))
            {
                this.InventoryItems.Clear();
                DataTable Data = null;

                using (DatabaseClient dbClient = UberEnvironment.GetDatabase().GetClient())
                {
                    dbClient.AddParamWithValue("userid", UserId);
                    Data = dbClient.ReadDataTable("SELECT id,base_item,extra_data FROM user_items WHERE user_id = @userid");
                }

                if (Data != null)
                {
                    foreach (DataRow Row in Data.Rows)
                    {
                        InventoryItems.Add(new UserItem((uint)Row["id"], (uint)Row["base_item"], (string)Row["extra_data"]));
                    }
                }
            }

            using (TimedLock.Lock(this.InventoryItems))
            {
                this.InventoryPets.Clear();
                DataTable Data = null;

                using (DatabaseClient dbClient = UberEnvironment.GetDatabase().GetClient())
                {
                    dbClient.AddParamWithValue("userid", UserId);
                    Data = dbClient.ReadDataTable("SELECT * FROM user_pets WHERE user_id = @userid AND room_id <= 0");
                }

                if (Data != null)
                {
                    foreach (DataRow Row in Data.Rows)
                    {
                        InventoryPets.Add(UberEnvironment.GetGame().GetCatalog().GeneratePetFromRow(Row));
                    }
                }
            }
        }

        public void UpdateItems(bool FromDatabase)
        {
            if (FromDatabase)
            {
                LoadInventory();
            }

            GetClient().GetMessageHandler().GetResponse().Init(101);
            GetClient().GetMessageHandler().SendResponse();
        }

        public void UpdatePets(bool FromDatabase)
        {
            if (FromDatabase)
            {
                LoadInventory();
            }

            GetClient().SendMessage(SerializePetInventory());
        }

        public Pet GetPet(uint Id)
        {
           // lock (this.InventoryPets)
            using (TimedLock.Lock(this.InventoryPets))
            {
                List<Pet>.Enumerator Pets = this.InventoryPets.GetEnumerator();

                while (Pets.MoveNext())
                {
                    Pet Pet = Pets.Current;

                    if (Pet.PetId == Id)
                    {
                        return Pet;
                    }
                }
            }

            return null;
        }

        public UserItem GetItem(uint Id)
        {
            using (TimedLock.Lock(this.InventoryItems))
            {
                List<UserItem>.Enumerator Items = this.InventoryItems.GetEnumerator();

                while (Items.MoveNext())
                {
                    UserItem Item = Items.Current;

                    if (Item.Id == Id)
                    {
                        return Item;
                    }
                }
            }

            return null;
        }

        public void AddItem(uint Id, uint BaseItem, string ExtraData)
        {
            using (TimedLock.Lock(this.InventoryItems))
            {
                InventoryItems.Add(new UserItem(Id, BaseItem, ExtraData));

                using (DatabaseClient dbClient = UberEnvironment.GetDatabase().GetClient())
                {
                    dbClient.AddParamWithValue("extra_data", ExtraData);
                    dbClient.ExecuteQuery("INSERT INTO user_items (id,user_id,base_item,extra_data) VALUES ('" + Id + "','" + UserId + "','" + BaseItem + "',@extra_data)");
                }
            }
        }

        public void AddPet(Pet Pet)
        {
            if (Pet == null)
            {
                return;
            }

            Pet.PlacedInRoom = false;

            InventoryPets.Add(Pet);

            using (DatabaseClient dbClient = UberEnvironment.GetDatabase().GetClient())
            {
                dbClient.AddParamWithValue("botid", Pet.PetId);
                dbClient.ExecuteQuery("UPDATE user_pets SET room_id = 0, x = 0, y = 0, z = 0 WHERE id = @botid LIMIT 1");
            }

            ServerMessage AddMessage = new ServerMessage(603);
            Pet.SerializeInventory(AddMessage);
            GetClient().SendMessage(AddMessage);
        }

        public bool RemovePet(uint PetId)
        {
            using (TimedLock.Lock(this.InventoryPets))
            {
                foreach (Pet Pet in this.InventoryPets)
                {
                    if (Pet.PetId != PetId)
                    {
                        continue;
                    }

                    this.InventoryPets.Remove(Pet);

                    ServerMessage RemoveMessage = new ServerMessage(604);
                    RemoveMessage.AppendUInt(PetId);
                    GetClient().SendMessage(RemoveMessage);

                    return true;
                }
            }

            return false;
        }

        public void MovePetToRoom(uint PetId, uint RoomId)
        {
            if (RemovePet(PetId))
            {
                using (DatabaseClient dbClient = UberEnvironment.GetDatabase().GetClient())
                {
                    dbClient.AddParamWithValue("roomid", RoomId);
                    dbClient.AddParamWithValue("petid", PetId);
                    dbClient.ExecuteQuery("UPDATE user_pets SET room_id = @roomid, x = 0, y = 0, z = 0 WHERE id = @petid LIMIT 1");
                }
            }
        }

        public void RemoveItem(uint Id)
        {
            GetClient().GetMessageHandler().GetResponse().Init(99);
            GetClient().GetMessageHandler().GetResponse().AppendUInt(Id);
            GetClient().GetMessageHandler().SendResponse();

            using (TimedLock.Lock(this.InventoryItems))
            {
                InventoryItems.Remove(GetItem(Id));

                using (DatabaseClient dbClient = UberEnvironment.GetDatabase().GetClient())
                {
                    dbClient.ExecuteQuery("DELETE FROM user_items WHERE id = '" + Id + "' LIMIT 1");
                }
            }
        }

                public ServerMessage SerializeItemInventory()
        {
            ServerMessage Message = new ServerMessage(140);

            Message.AppendStringWithBreak("S");
            Message.AppendInt32(1);
            Message.AppendInt32(1);
            Message.AppendInt32(this.ItemCount);

            lock (this.InventoryItems)
            {
                List<UserItem>.Enumerator eItems = this.InventoryItems.GetEnumerator();

                while (eItems.MoveNext())
                {
                    eItems.Current.Serialize(Message, true);
                }
            }

            return Message;
        }  
        {
            ServerMessage Message = new ServerMessage(140);
            Message.AppendInt32(this.ItemCount);

            using (TimedLock.Lock(this.InventoryItems))
            {
                List<UserItem>.Enumerator eItems = this.InventoryItems.GetEnumerator();

                while (eItems.MoveNext())
                {
                    eItems.Current.Serialize(Message, true);
                }
            }

            Message.AppendInt32(this.ItemCount);
            return Message;
        }

        public ServerMessage SerializePetInventory()
        {
            ServerMessage Message = new ServerMessage(600);
            Message.AppendInt32(InventoryPets.Count);

            foreach (Pet Pet in InventoryPets)
            {
                Pet.SerializeInventory(Message);
            }

            return Message;
        }

        private GameClient GetClient()
        {
            return UberEnvironment.GetGame().GetClientManager().GetClientByHabbo(UserId);
        }
    }
}

useritems.cs
PHP:
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

using Uber.Messages;
using Uber.HabboHotel.GameClients;

namespace Uber.HabboHotel.Items
{
    class UserItem
    {
        public uint Id;
        public uint BaseItem;
        public string ExtraData;

        public UserItem(uint Id, uint BaseItem, string ExtraData)
        {
            this.Id = Id;
            this.BaseItem = BaseItem;
            this.ExtraData = ExtraData;
        }

        public void Serialize(ServerMessage Message, Boolean Inventory)
        {
            Message.AppendUInt(Id);
            Message.AppendStringWithBreak(GetBaseItem().Type.ToUpper());
            Message.AppendUInt(Id);
            Message.AppendInt32(GetBaseItem().SpriteId);

            if (GetBaseItem().Name.Contains("a2"))
            {
                Message.AppendInt32(3);
            }
            else if (GetBaseItem().Name.Contains("wallpaper"))
            {
                Message.AppendInt32(2);
            }
            else if (GetBaseItem().Name.Contains("landscape"))
            {
                Message.AppendInt32(4);
            }
            else
            {
                Message.AppendInt32(0);
            }

            Message.AppendStringWithBreak(ExtraData);
            Message.AppendBoolean(GetBaseItem().AllowRecycle);
            Message.AppendBoolean(GetBaseItem().AllowTrade);
            Message.AppendBoolean(GetBaseItem().AllowInventoryStack);
            Message.AppendBoolean(UberEnvironment.GetGame().GetCatalog().GetMarketplace().CanSellItem(this));
            Message.AppendInt32(-1);

            if (GetBaseItem().Type.ToLower() == "s")
            {
                Message.AppendStringWithBreak("");
                Message.AppendInt32(-1);
            }
        }

        public Item GetBaseItem()
        {
            return UberEnvironment.GetGame().GetItemManager().GetItem(BaseItem);
        }
    }
}


---------- Post added at 07:59 PM ---------- Previous post was at 06:39 PM ----------

BUMP could anyone help with the above?
 
Last edited:
Same, I recoded the things you said, but still no work. Thanks for the post though.

Also, can anyone upload a full working r63 emu with inv fix and all? TY
 
Status
Not open for further replies.
Back