peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2024-11-25 05:49:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed incorrect remove function and corrected a mistake during the initiation of a game over state

Browse Source
This commit is contained in:
Yvonne Schmidt 2024-10-06 14:52:33 +02:00
parent 71a4ac8d12
commit 6475b63a22
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/battleship/model/src/main/java/pp/battleship/game/client/BattleState.java
View File

@ -60,7 +60,7 @@ class BattleState extends ClientState {
if (destroyedOpponentShip(msg)) if (destroyedOpponentShip(msg))
logic.getOpponentMap().add(msg.getDestroyedShip()); logic.getOpponentMap().add(msg.getDestroyedShip());
if (msg.isGameOver()) { if (msg.isGameOver()) {
msg.getRemainingOpponentShips().forEach(logic.getOwnMap()::add); msg.getRemainingOpponentShips().forEach(logic.getOpponentMap()::add);
logic.setState(new GameOverState(logic)); logic.setState(new GameOverState(logic));
} }
} }

3
Projekte/battleship/model/src/main/java/pp/battleship/model/ShipMap.java
View File

@ -10,6 +10,7 @@ package pp.battleship.model;
import pp.battleship.notification.GameEvent; import pp.battleship.notification.GameEvent;
import pp.battleship.notification.GameEventBroker; import pp.battleship.notification.GameEventBroker;
import pp.battleship.notification.ItemAddedEvent; import pp.battleship.notification.ItemAddedEvent;
import pp.battleship.notification.ItemRemovedEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -97,7 +98,7 @@ public class ShipMap {
*/ */
public void remove(Item item) { public void remove(Item item) {
items.remove(item); items.remove(item);
notifyListeners(new ItemAddedEvent(item, this)); notifyListeners(new ItemRemovedEvent(item, this));
} }
/** /**