Merge remote-tracking branch 'origin/gui' into gui

This commit is contained in:
Yvonne Schmidt 2024-12-02 05:13:08 +01:00
commit 0698c29410
3 changed files with 3 additions and 3 deletions

View File

@ -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());
} }

View File

@ -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();
} }

View File

@ -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) {