peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-11-02 22:21:04 +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-09 05:53:08 +01:00
parent 111f2b1283 93386fa77a
commit c9e99ee9ff
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java
View File

@@ -310,6 +310,8 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
} else if(msg.getKeyWord().equals("ReceivedRent")) {
playSound(Sound.MONEY_COLLECTED);
notifyListeners(new PopUpEvent("ReceivedRent", msg));
} else if (msg.getKeyWord().equals("aussetzen")) {
notifyListeners(new ButtonStatusEvent(false));
}
}

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

@@ -85,7 +85,7 @@ public class ServerGameLogic implements ClientInterpreter {
* @param player the Player to whom the message is sent
* @param msg the ServerMessage to send
*/
void send(Player player, ServerMessage msg) {
public void send(Player player, ServerMessage msg) {
if (player != null && msg != null) {
serverSender.send(player.getId(), msg);
LOGGER.log(Level.DEBUG, "Message sent to player {0}: {1}", player.getName(), msg.getClass().getSimpleName());

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

@@ -8,6 +8,7 @@ import java.util.Queue;
import pp.monopoly.game.server.Player;
import pp.monopoly.message.client.EndTurn;
import pp.monopoly.message.server.NotificationMessage;
public class DeckHelper{
@@ -258,6 +259,7 @@ public class DeckHelper{
private void rueckstuferantrag(Player player) {
player.getHandler().getLogic().received(new EndTurn(), player.getId());
player.getHandler().getLogic().send(player, new NotificationMessage("aussetzen"));
}
private void hausfeierSturz(Player player) {