nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-07-04 14:25:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed magictile placement on non-stackable items when being placed from your inventory.

Browse Source
This commit is contained in:
KrewsOrg 2019-05-09 03:02:41 +01:00
parent d08795159f
commit 9b6a380a3d
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

@ -5425,23 +5425,24 @@ public class Room implements Comparable<Room>, ISerialize, Runnable
if (this.hasPetsAt(t.x, t.y)) return FurnitureMovementError.TILE_HAS_PETS; if (this.hasPetsAt(t.x, t.y)) return FurnitureMovementError.TILE_HAS_PETS;
} }
List<Pair<RoomTile, THashSet<HabboItem>>> tileFurniList = new ArrayList<>(); boolean magicTile = item instanceof InteractionStackHelper;
for (RoomTile t : occupiedTiles)
{
tileFurniList.add(Pair.create(t, this.getItemsAt(t)));
HabboItem topItem = this.getTopItemAt(t.x, t.y, item); if(!magicTile) {
if (topItem != null && !topItem.getBaseItem().allowStack()) List<Pair<RoomTile, THashSet<HabboItem>>> tileFurniList = new ArrayList<>();
{ for (RoomTile t : occupiedTiles) {
tileFurniList.add(Pair.create(t, this.getItemsAt(t)));
HabboItem topItem = this.getTopItemAt(t.x, t.y, item);
if (topItem != null && !topItem.getBaseItem().allowStack() && !t.getAllowStack()) {
return FurnitureMovementError.CANT_STACK;
}
}
if (!item.canStackAt(this, tileFurniList)) {
return FurnitureMovementError.CANT_STACK; return FurnitureMovementError.CANT_STACK;
} }
} }
if (!item.canStackAt(this, tileFurniList))
{
return FurnitureMovementError.CANT_STACK;
}
return FurnitureMovementError.NONE; return FurnitureMovementError.NONE;
} }
public FurnitureMovementError placeFloorFurniAt(HabboItem item, RoomTile tile, int rotation, Habbo owner) throws Exception public FurnitureMovementError placeFloorFurniAt(HabboItem item, RoomTile tile, int rotation, Habbo owner) throws Exception