From 9c01aabbe1051fc397ba253bdd417b8922ee3114 Mon Sep 17 00:00:00 2001 From: Bas de Jong Date: Wed, 7 Jan 2026 23:46:21 +0100 Subject: [PATCH] Fixed merge mistakes --- .../org/toop/app/gameControllers/GenericGameController.java | 2 +- .../main/java/org/toop/framework/game/players/LocalPlayer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java b/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java index 5b00fa9..0c68a74 100644 --- a/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java +++ b/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java @@ -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.view.GUIEvents; 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 { protected final EventFlow eventFlow = new EventFlow(); diff --git a/framework/src/main/java/org/toop/framework/game/players/LocalPlayer.java b/framework/src/main/java/org/toop/framework/game/players/LocalPlayer.java index 7117ada..f922179 100644 --- a/framework/src/main/java/org/toop/framework/game/players/LocalPlayer.java +++ b/framework/src/main/java/org/toop/framework/game/players/LocalPlayer.java @@ -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.player.AbstractPlayer;