diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java index 7efcae4..f69eeba 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java @@ -157,7 +157,7 @@ public class TradeMenu extends Dialog { .getBoardManager() .getPropertyFields(app.getGameLogic() .getPlayerHandler() - .getPlayerById(isLeft ? tradeHandler.getReceiver().getId() : tradeHandler.getSender().getId()) + .getPlayerById(isLeft ? tradeHandler.getSender().getId() : tradeHandler.getReceiver().getId()) .getProperties()); } diff --git a/Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java b/Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java index aa95bee..de1aef2 100644 --- a/Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java +++ b/Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java @@ -298,7 +298,7 @@ public class ServerGameLogic implements ClientInterpreter { receiver.addJailCard(); } - for (int i = 0; i < tradeHandler.getRequestedAmount(); i++) { + for (int i = 0; i < tradeHandler.getRequestedJailCards(); i++) { sender.addJailCard(); receiver.removeJailCard(); } diff --git a/Projekte/monopoly/model/src/main/java/pp/monopoly/model/card/DeckHelper.java b/Projekte/monopoly/model/src/main/java/pp/monopoly/model/card/DeckHelper.java index 4a10146..3c1ecf2 100644 --- a/Projekte/monopoly/model/src/main/java/pp/monopoly/model/card/DeckHelper.java +++ b/Projekte/monopoly/model/src/main/java/pp/monopoly/model/card/DeckHelper.java @@ -249,7 +249,7 @@ public class DeckHelper{ } private void jahresabschlussantreten(Player player) { - player.setPositionWithMoney(17); + player.setPositionWithMoney(16); } private void verkaufenVersicherungen(Player player) {