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-19 02:36:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Johannes Schmelz 2024-11-29 06:17:57 +01:00
parent 908ba09e2a
commit 2d9cd0e4e1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java
View File

@ -4,13 +4,14 @@ import java.util.List;
import pp.monopoly.client.MonopolyApp; import pp.monopoly.client.MonopolyApp;
import pp.monopoly.client.gui.popups.BuyCard; import pp.monopoly.client.gui.popups.BuyCard;
import pp.monopoly.client.gui.popups.EventCard;
import pp.monopoly.client.gui.popups.FoodFieldCard; import pp.monopoly.client.gui.popups.FoodFieldCard;
import pp.monopoly.client.gui.popups.GateFieldCard; import pp.monopoly.client.gui.popups.GateFieldCard;
import pp.monopoly.game.server.Player; import pp.monopoly.game.server.Player;
import pp.monopoly.model.fields.BuildingProperty; import pp.monopoly.model.fields.BuildingProperty;
import pp.monopoly.model.fields.FoodField; import pp.monopoly.model.fields.FoodField;
import pp.monopoly.model.fields.GateField; import pp.monopoly.model.fields.GateField;
import pp.monopoly.notification.EventCardEvent;
import pp.monopoly.notification.GameEventListener; import pp.monopoly.notification.GameEventListener;
import pp.monopoly.notification.PopUpEvent; import pp.monopoly.notification.PopUpEvent;
@ -33,7 +34,7 @@ public class TestWorld implements GameEventListener{
public TestWorld(MonopolyApp app, List<Player> players) { public TestWorld(MonopolyApp app, List<Player> players) {
this.app = app; this.app = app;
this.players = players; this.players = players;
app.getGameLogic().removeListener(this); app.getGameLogic().addListener(this);
} }
/** /**
@ -141,8 +142,10 @@ public class TestWorld implements GameEventListener{
} else if (fieldObject instanceof FoodField) { } else if (fieldObject instanceof FoodField) {
new FoodFieldCard(app).open(); new FoodFieldCard(app).open();
} }
}
@Override
public void receivedEvent(EventCardEvent event) {
new EventCard(app, event.description()).open();
} }
} }