🆙 Rollback of the Wired Condition Furni Have Habbo, fixed in Nitro
This commit is contained in:
parent
fce552942c
commit
505d2144fb
@ -50,10 +50,14 @@ public class WiredConditionFurniHaveHabbo extends InteractionWiredCondition {
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
Collection<Habbo> habbos = room.getHabbos();
|
Collection<Habbo> habbos = room.getHabbos();
|
||||||
|
Collection<Bot> bots = room.getCurrentBots().valueCollection();
|
||||||
|
Collection<Pet> pets = room.getCurrentPets().valueCollection();
|
||||||
|
|
||||||
return this.items.stream().anyMatch(item -> {
|
return this.items.stream().allMatch(item -> {
|
||||||
THashSet<RoomTile> occupiedTiles = room.getLayout().getTilesAt(room.getLayout().getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), item.getRotation());
|
THashSet<RoomTile> occupiedTiles = room.getLayout().getTilesAt(room.getLayout().getTile(item.getX(), item.getY()), item.getBaseItem().getWidth(), item.getBaseItem().getLength(), item.getRotation());
|
||||||
return habbos.stream().anyMatch(character -> occupiedTiles.contains(character.getRoomUnit().getCurrentLocation()));
|
return habbos.stream().anyMatch(character -> occupiedTiles.contains(character.getRoomUnit().getCurrentLocation())) ||
|
||||||
|
bots.stream().anyMatch(character -> occupiedTiles.contains(character.getRoomUnit().getCurrentLocation())) ||
|
||||||
|
pets.stream().anyMatch(character -> occupiedTiles.contains(character.getRoomUnit().getCurrentLocation()));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user