Reply to thread

Message

<blockquote data-quote="Sledmore" data-source="post: 428281" data-attributes="member: 591">I believe that command needs rewriting, it does more work than it should.<a href="https://github.com/Sledmore/PlusEMU/blob/master/HabboHotel/Rooms/Chat/Commands/User/PickAllCommand.cs#L33" target="_blank">https://github.com/Sledmore/PlusEMU/blob/master/HabboHotel/Rooms/Chat/Commands/User/PickAllCommand.cs#L33</a>The issue is mostly line 33, it removes all items but sends to that session.<a href="https://github.com/Sledmore/PlusEMU/blob/master/HabboHotel/Rooms/RoomItemHandling.cs#L856" target="_blank">https://github.com/Sledmore/PlusEMU/blob/master/HabboHotel/Rooms/RoomItemHandling.cs#L856</a>A couple tweaks and you can send it to the correct user.Also, I believe this command is wrong, I think the correct use is pickall for the users furniture, and :ejectall for everything else.Maybe a nicer way to do it would be;[PHP]public void Execute(GameClients.GameClient session, Rooms.Room room, string[] Params){&nbsp; &nbsp; if (!room.CheckRights(session, true))&nbsp; &nbsp; &nbsp; &nbsp; return;&nbsp; &nbsp; foreach (Item item in room.GetRoomItemHandler().GetWallAndFloor.Where(x =&gt; x.UserID == room.OwnerId).ToList())&nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; if (item == null)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; continue;&nbsp; &nbsp; &nbsp; &nbsp; room.GetRoomItemHandler().RemoveFurniture(session, item.Id);&nbsp; &nbsp; &nbsp; &nbsp; session.GetHabbo().GetInventoryComponent().AddNewItem(item.Id, item.BaseItem, item.ExtraData, item.GroupId, true, true, item.LimitedNo, item.LimitedTot);&nbsp; &nbsp; &nbsp; &nbsp; session.GetHabbo().GetInventoryComponent().UpdateItems(false);&nbsp; &nbsp; }&nbsp; &nbsp; List&lt;Item&gt; Items = room.GetRoomItemHandler().GetWallAndFloor.ToList();&nbsp; &nbsp; if (Items.Count &gt; 0)&nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; session.SendWhisper(&quot;Items that belong to other users still exist within this room, use :ejectall to eject them!&quot;);&nbsp; &nbsp; }&nbsp; &nbsp; session.SendPacket(new FurniListUpdateComposer());}[/PHP]Eject All could then be seen as;[PHP]public void Execute(GameClients.GameClient session, Rooms.Room room, string[] Params){&nbsp; &nbsp; if (session.GetHabbo().Id == room.OwnerId)&nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; // ehh&nbsp; &nbsp; &nbsp; &nbsp; if (!room.CheckRights(session, true))&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; foreach (Item item in room.GetRoomItemHandler().GetWallAndFloor.ToList())&nbsp; &nbsp; &nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; if (item == null)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; continue;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; GameClient client = Environment.GetGame().GetClientManager().GetClientByUserID(item.UserID);&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; if (client != null &amp;&amp; client.GetHabbo() != null)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; room.GetRoomItemHandler().RemoveFurniture(client, item.Id);&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; client.GetHabbo().GetInventoryComponent().AddNewItem(item.Id, item.BaseItem, item.ExtraData, item.GroupId, true, true, item.LimitedNo, item.LimitedTot);&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; client.GetHabbo().GetInventoryComponent().UpdateItems(false);&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; else&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; room.GetRoomItemHandler().RemoveFurniture(null, item.Id);&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; using (IQueryAdapter dbClient = Environment.GetDatabaseManager().GetQueryReactor())&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; dbClient.RunQuery(&quot;UPDATE `items` SET `room_id` = '0' WHERE `id` = '&quot; + item.Id + &quot;' LIMIT 1&quot;);&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }&nbsp; &nbsp; &nbsp; &nbsp; }&nbsp; &nbsp; }&nbsp; &nbsp; else&nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; // We're removing our own items only here.&nbsp; &nbsp; &nbsp; &nbsp; foreach (Item item in room.GetRoomItemHandler().GetWallAndFloor.Where(x =&gt; x.UserID == session.GetHabbo().Id).ToList())&nbsp; &nbsp; &nbsp; &nbsp; {&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; if (item == null)&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; continue;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; room.GetRoomItemHandler().RemoveFurniture(session, item.Id);&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; session.GetHabbo().GetInventoryComponent().AddNewItem(item.Id, item.BaseItem, item.ExtraData, item.GroupId, true, true, item.LimitedNo, item.LimitedTot);&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; session.GetHabbo().GetInventoryComponent().UpdateItems(false);&nbsp; &nbsp; &nbsp; &nbsp; }&nbsp; &nbsp; }}[/PHP]</blockquote>

[QUOTE="Sledmore, post: 428281, member: 591"] I believe that command needs rewriting, it does more work than it should. [URL]https://github.com/Sledmore/PlusEMU/blob/master/HabboHotel/Rooms/Chat/Commands/User/PickAllCommand.cs#L33[/URL] The issue is mostly line 33, it removes all items but sends to that session. [URL]https://github.com/Sledmore/PlusEMU/blob/master/HabboHotel/Rooms/RoomItemHandling.cs#L856[/URL] A couple tweaks and you can send it to the correct user. [B]Also, I believe this command is wrong, I think the correct use is pickall for the users furniture, and :ejectall for everything else.[/B] Maybe a nicer way to do it would be; [PHP] public void Execute(GameClients.GameClient session, Rooms.Room room, string[] Params) { if (!room.CheckRights(session, true)) return; foreach (Item item in room.GetRoomItemHandler().GetWallAndFloor.Where(x => x.UserID == room.OwnerId).ToList()) { if (item == null) continue; room.GetRoomItemHandler().RemoveFurniture(session, item.Id); session.GetHabbo().GetInventoryComponent().AddNewItem(item.Id, item.BaseItem, item.ExtraData, item.GroupId, true, true, item.LimitedNo, item.LimitedTot); session.GetHabbo().GetInventoryComponent().UpdateItems(false); } List<Item> Items = room.GetRoomItemHandler().GetWallAndFloor.ToList(); if (Items.Count > 0) { session.SendWhisper("Items that belong to other users still exist within this room, use :ejectall to eject them!"); } session.SendPacket(new FurniListUpdateComposer()); } [/PHP] Eject All could then be seen as; [PHP] public void Execute(GameClients.GameClient session, Rooms.Room room, string[] Params) { if (session.GetHabbo().Id == room.OwnerId) { // ehh if (!room.CheckRights(session, true)) return; foreach (Item item in room.GetRoomItemHandler().GetWallAndFloor.ToList()) { if (item == null) continue; GameClient client = Environment.GetGame().GetClientManager().GetClientByUserID(item.UserID); if (client != null && client.GetHabbo() != null) { room.GetRoomItemHandler().RemoveFurniture(client, item.Id); client.GetHabbo().GetInventoryComponent().AddNewItem(item.Id, item.BaseItem, item.ExtraData, item.GroupId, true, true, item.LimitedNo, item.LimitedTot); client.GetHabbo().GetInventoryComponent().UpdateItems(false); } else { room.GetRoomItemHandler().RemoveFurniture(null, item.Id); using (IQueryAdapter dbClient = Environment.GetDatabaseManager().GetQueryReactor()) { dbClient.RunQuery("UPDATE `items` SET `room_id` = '0' WHERE `id` = '" + item.Id + "' LIMIT 1"); } } } } else { // We're removing our own items only here. foreach (Item item in room.GetRoomItemHandler().GetWallAndFloor.Where(x => x.UserID == session.GetHabbo().Id).ToList()) { if (item == null) continue; room.GetRoomItemHandler().RemoveFurniture(session, item.Id); session.GetHabbo().GetInventoryComponent().AddNewItem(item.Id, item.BaseItem, item.ExtraData, item.GroupId, true, true, item.LimitedNo, item.LimitedTot); session.GetHabbo().GetInventoryComponent().UpdateItems(false); } } }[/PHP] [/QUOTE]

Verification

Reply to thread

Connect with us

Newest members