peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-01-18 19:33:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java
View File

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

2
Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java
View File

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

2
Projekte/monopoly/model/src/main/java/pp/monopoly/model/card/DeckHelper.java
View File

@ -249,7 +249,7 @@ public class DeckHelper{
}
private void jahresabschlussantreten(Player player) {
player.setPositionWithMoney(17);
player.setPositionWithMoney(16);
}
private void verkaufenVersicherungen(Player player) {