Fixed: MiniModel after new game error
This commit is contained in:
@@ -29,7 +29,6 @@ public class GUI extends Application implements IView {
|
||||
FXMLLoader loaderMain;
|
||||
Scene mainScene;
|
||||
MainFXMLController controllerMain;
|
||||
MiniModel miniModel;
|
||||
|
||||
FXMLLoader loaderLeaderboard;
|
||||
Scene leaderboardScene;
|
||||
@@ -92,7 +91,8 @@ public class GUI extends Application implements IView {
|
||||
|
||||
@Override
|
||||
public void setModel(MiniModel miniModel) {
|
||||
this.miniModel=miniModel;
|
||||
this.controller.setModel(miniModel);
|
||||
|
||||
}
|
||||
|
||||
public void setController(ClientController controller) {
|
||||
@@ -103,7 +103,7 @@ public class GUI extends Application implements IView {
|
||||
Platform.runLater(() -> {
|
||||
boolean toFull=false;
|
||||
|
||||
synchronized (miniModel) {
|
||||
synchronized (controller.miniModel) {
|
||||
if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) {
|
||||
if (primaryStage.getScene()!=leaderboardScene) {
|
||||
toFull=true;
|
||||
@@ -146,7 +146,7 @@ public class GUI extends Application implements IView {
|
||||
controllerLogin.showError(error);
|
||||
primaryStage.setFullScreen(true);
|
||||
}else {
|
||||
synchronized (miniModel) {
|
||||
synchronized (controller.miniModel) {
|
||||
controllerMain.isError = true;
|
||||
controllerMain.render();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user