made not able to move dead people

core/src/netwerkprog/game/client/MainGame.java

@@ -29,6 +29,7 @@ import netwerkprog.game.util.data.character.MoveData;
 import netwerkprog.game.util.data.connection.NameData;
 import netwerkprog.game.util.data.connection.ReadyData;
 import netwerkprog.game.util.data.connection.TeamData;
+import netwerkprog.game.util.data.connection.TurnData;
 import netwerkprog.game.util.game.Faction;
 import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.FrameRate;
@@ -254,14 +255,25 @@ public class MainGame extends Game implements ClientCallback {
         frameRate.update();
         camera.update();
         this.gameInputProcessor.update();
-        this.team.update(Gdx.graphics.getDeltaTime());
+
-        this.enemyTeam.update(Gdx.graphics.getDeltaTime());
         if (this.team.isDead() || this.enemyTeam.isDead()) {
             this.setGameOver(true);
         }
         if (this.isGameOver()) {
             this.setGamestate(GAMESTATE.ENDED);
         }
+
+        if (selectedCharacter.isDead()) {
+            nextCharacter(selectedCharacter);
+        }
+        this.team.update(Gdx.graphics.getDeltaTime());
+        this.enemyTeam.update(Gdx.graphics.getDeltaTime());
+    }
+
+    private void nextCharacter(GameCharacter c) {
+        for (GameCharacter character : this.team.getMembers()) {
+            if (!character.equals(c)) this.setSelectedCharacter(character);
+        }
     }
 
     @Override
@@ -304,10 +316,12 @@ public class MainGame extends Game implements ClientCallback {
     }
 
     public void setSelectedCharacter(GameCharacter character) {
-        this.selectedCharacter = character;
+        if  (!character.isDead()) {
-        GameTile characterTile = mapRenderer.getTile(character);
+            this.selectedCharacter = character;
-        Point pos = mapRenderer.getPos(characterTile);
+            GameTile characterTile = mapRenderer.getTile(character);
-        mapRenderer.setSurroundedTilesOfCurrentCharacter(pos.x, pos.y);
+            Point pos = mapRenderer.getPos(characterTile);
+            mapRenderer.setSurroundedTilesOfCurrentCharacter(pos.x, pos.y);
+        }
     }
 
     public GAMESTATE getGamestate() {
@@ -351,6 +365,7 @@ public class MainGame extends Game implements ClientCallback {
         if (turn == 3) {
             this.turn = 0;
             this.setPlayersTurn(false);
+            send(new TurnData());
         }
     }
 
@@ -395,11 +410,15 @@ public class MainGame extends Game implements ClientCallback {
             MoveData moveData = (MoveData) data;
             if (!moveData.getUsername().equals(this.username)) {
                 GameTile tile = mapRenderer.getGameTile(moveData.getPos());
-                tile.visit(enemyTeam.get(moveData.getCharacterName()));
+                GameCharacter character = enemyTeam.get(moveData.getCharacterName());
+                gameInputProcessor.removeCharacterFromTile(character);
+                tile.visit(character);
             }
         } else if (data instanceof DamageData) {
             DamageData damageData = (DamageData) data;
             team.get(damageData.getName()).damage(10);
+        } else if (data instanceof TurnData) {
+            this.playersTurn = !this.playersTurn;
         }
 
     }
@@ -412,6 +431,7 @@ public class MainGame extends Game implements ClientCallback {
         initCharacters();
         camera.translate(-400, 0);
 
+        this.playersTurn = true;
         setGamestate(GAMESTATE.PLAYING);
     }
 
@@ -420,6 +440,7 @@ public class MainGame extends Game implements ClientCallback {
         setChosenFaction(Faction.MEGACORPORATION);
         send(new TeamData(Faction.MEGACORPORATION, getUsername()));
         initCharacters();
+        this.playersTurn = false;
         setGamestate(GAMESTATE.PLAYING);
     }
 

core/src/netwerkprog/game/client/game/map/GameInputProcessor.java

@@ -160,7 +160,7 @@ public class GameInputProcessor implements InputProcessor {
                                         gameTile.visit(mainGame.getSelectedCharacter());
                                         mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
                                         mainGame.increaseTurn();
-                                        mainGame.send(new MoveData(mainGame.getUsername(),mainGame.getSelectedCharacter().getName(),gameTile));
+                                        mainGame.send(new MoveData(mainGame.getUsername(),mainGame.getSelectedCharacter().getName(),mainGame.mapRenderer.getPos(gameTile)));
                                     }
                                 }
 //                            clicking on enemy
@@ -195,7 +195,7 @@ public class GameInputProcessor implements InputProcessor {
         return false;
     }
 
-    private void removeCharacterFromTile(GameCharacter character) {
+    public void removeCharacterFromTile(GameCharacter character) {
         rowLoop:
         for (int row = 0; row < mainGame.mapRenderer.getGameTiles().length; row++) {
             for (int col = 0; col < mainGame.mapRenderer.getGameTiles()[0].length; col++) {

core/src/netwerkprog/game/util/data/connection/TurnData.java

@@ -0,0 +1,9 @@
+package netwerkprog.game.util.data.connection;
+
+import netwerkprog.game.util.data.Data;
+
+public class TurnData extends Data {
+    public TurnData() {
+        super("turn");
+    }
+}