From cb362c4d0cf028240813ad485254c2f6ae785e0c Mon Sep 17 00:00:00 2001 From: Daniel Grigencha Date: Mon, 2 Dec 2024 16:31:57 +0100 Subject: [PATCH] Used auto-reformate code. --- .../client/src/main/java/pp/mdga/client/MdgaApp.java | 2 +- .../main/java/pp/mdga/server/automaton/LobbyState.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java index cb0371c0..2fddea2f 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java @@ -1,9 +1,9 @@ package pp.mdga.client; import com.jme3.app.SimpleApplication; +import com.jme3.system.AppSettings; import com.simsilica.lemur.GuiGlobals; import pp.mdga.client.acoustic.AcousticHandler; -import com.jme3.system.AppSettings; import pp.mdga.client.dialog.JoinDialog; import pp.mdga.client.view.*; diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java index 32b400b6..167992c2 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java @@ -49,7 +49,7 @@ public void exit() { * This method will be used to initialize the game and all necessary objects. */ public void initializeGame() { - for (Map.Entry entry: this.logic.getGame().getPlayers().entrySet()) { + for (Map.Entry entry : this.logic.getGame().getPlayers().entrySet()) { this.logic.getGame().getBoard().addPlayerData(entry.getValue().getColor(), new PlayerData(entry.getValue().getColor())); } } @@ -86,7 +86,7 @@ public void received(SelectTSKMessage msg, int from) { } } - if(this.logic.getGame().getPlayerById(from).getColor() != Color.NONE) { + if (this.logic.getGame().getPlayerById(from).getColor() != Color.NONE) { this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, this.logic.getGame().getPlayerById(from).getColor(), false)); } @@ -117,7 +117,7 @@ public void received(DeselectTSKMessage msg, int from) { @Override public void received(LobbyReadyMessage msg, int from) { //assign a free color - if(this.logic.getGame().getPlayerById(from).getColor() == Color.NONE) { + if (this.logic.getGame().getPlayerById(from).getColor() == Color.NONE) { ArrayList colors = new ArrayList<>(); colors.add(Color.ARMY); colors.add(Color.AIRFORCE); @@ -125,12 +125,12 @@ public void received(LobbyReadyMessage msg, int from) { colors.add(Color.CYBER); for (Map.Entry entry : this.logic.getGame().getPlayers().entrySet()) { - if(colors.contains(entry.getValue().getColor())) { + if (colors.contains(entry.getValue().getColor())) { colors.remove(entry.getValue().getColor()); } } - if(colors.size() < 1) { + if (colors.size() < 1) { throw new RuntimeException("can not assign a color"); }