mirror of
https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git
synced 2025-01-18 22:56:15 +01:00
Merge remote-tracking branch 'origin/gui' into gui
This commit is contained in:
commit
0698c29410
@ -157,7 +157,7 @@ public class TradeMenu extends Dialog {
|
|||||||
.getBoardManager()
|
.getBoardManager()
|
||||||
.getPropertyFields(app.getGameLogic()
|
.getPropertyFields(app.getGameLogic()
|
||||||
.getPlayerHandler()
|
.getPlayerHandler()
|
||||||
.getPlayerById(isLeft ? tradeHandler.getReceiver().getId() : tradeHandler.getSender().getId())
|
.getPlayerById(isLeft ? tradeHandler.getSender().getId() : tradeHandler.getReceiver().getId())
|
||||||
.getProperties());
|
.getProperties());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -298,7 +298,7 @@ public class ServerGameLogic implements ClientInterpreter {
|
|||||||
receiver.addJailCard();
|
receiver.addJailCard();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < tradeHandler.getRequestedAmount(); i++) {
|
for (int i = 0; i < tradeHandler.getRequestedJailCards(); i++) {
|
||||||
sender.addJailCard();
|
sender.addJailCard();
|
||||||
receiver.removeJailCard();
|
receiver.removeJailCard();
|
||||||
}
|
}
|
||||||
|
@ -249,7 +249,7 @@ public class DeckHelper{
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void jahresabschlussantreten(Player player) {
|
private void jahresabschlussantreten(Player player) {
|
||||||
player.setPositionWithMoney(17);
|
player.setPositionWithMoney(16);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void verkaufenVersicherungen(Player player) {
|
private void verkaufenVersicherungen(Player player) {
|
||||||
|
Loading…
Reference in New Issue
Block a user