mirror of
https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git
synced 2025-08-01 06:27:40 +02:00
Merge remote-tracking branch 'origin/gui' into gui
This commit is contained in:
@@ -99,6 +99,7 @@ public class BuyHouse extends Dialog {
|
||||
AlterProperty msg = new AlterProperty("BuyHouse");
|
||||
msg.setProperties(selectedProperties.stream().map(p -> app.getGameLogic().getBoardManager().getFieldByName(p).getId()).map(p -> (Integer) p).collect(Collectors.toSet()));
|
||||
app.getGameLogic().send(msg);
|
||||
close();
|
||||
}));
|
||||
|
||||
// Center the popup
|
||||
@@ -160,6 +161,7 @@ public class BuyHouse extends Dialog {
|
||||
return boardManager.getPropertyFields(self.getProperties()).stream()
|
||||
.filter(property -> property instanceof BuildingProperty)
|
||||
.map(property -> (BuildingProperty) property)
|
||||
.filter(property -> app.getGameLogic().getBoardManager().canBuild(property))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user