From 4e375131d1d2289a5926bcf3cd0dd9b08c959d53 Mon Sep 17 00:00:00 2001 From: Johannes Schmelz Date: Mon, 2 Dec 2024 05:06:58 +0100 Subject: [PATCH 1/3] change property side --- .../client/src/main/java/pp/monopoly/client/gui/TradeMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); } From ff39402d8288fa76f24c00f073a6669d64961ee5 Mon Sep 17 00:00:00 2001 From: Johannes Schmelz Date: Mon, 2 Dec 2024 05:09:31 +0100 Subject: [PATCH 2/3] fixed event card position --- .../model/src/main/java/pp/monopoly/model/card/DeckHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From 08c1854885bb058e884d6b069be3db930c9905c8 Mon Sep 17 00:00:00 2001 From: Johannes Schmelz Date: Mon, 2 Dec 2024 05:10:45 +0100 Subject: [PATCH 3/3] fixed jail card trade --- .../src/main/java/pp/monopoly/game/server/ServerGameLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); }