stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge mistakes

Browse Source
This commit is contained in:
Bas de Jong
2026-01-07 23:46:21 +01:00
parent 0cb52b042f
commit 9c01aabbe1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/toop/app/gameControllers/GenericGameController.java
View File

@@ -16,7 +16,7 @@ import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehavio
import org.toop.framework.gameFramework.model.player.Player; import org.toop.framework.gameFramework.model.player.Player;
import org.toop.framework.gameFramework.view.GUIEvents; import org.toop.framework.gameFramework.view.GUIEvents;
import org.toop.framework.networking.connection.events.NetworkEvents; import org.toop.framework.networking.connection.events.NetworkEvents;
import org.toop.game.players.LocalPlayer; import org.toop.framework.game.players.LocalPlayer;
public class GenericGameController implements GameController { public class GenericGameController implements GameController {
protected final EventFlow eventFlow = new EventFlow(); protected final EventFlow eventFlow = new EventFlow();

2
framework/src/main/java/org/toop/framework/game/players/LocalPlayer.java
View File

@@ -1,4 +1,4 @@
package org.toop.game.players; package org.toop.framework.game.players;
import org.toop.framework.gameFramework.model.game.TurnBasedGame; import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import org.toop.framework.gameFramework.model.player.AbstractPlayer; import org.toop.framework.gameFramework.model.player.AbstractPlayer;