Fixed bug disconnecting players after first round

inf112-v19 · Apr 30, 2019 · dfe4d38 · dfe4d38
1 parent efa1c2e
commit dfe4d38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/sky7/Client/Client.java b/src/main/java/sky7/Client/Client.java
@@ -175,8 +175,9 @@ public void finishedProcessing(IBoard board) {
 
     @Override
     public void render(HashMap<Integer, ArrayList<ICard>> cards) {
-        game.process(cards);
-
+        new Thread(() -> {
+            game.process(cards);
+        }).start();
     }
 
     /**

diff --git a/src/main/java/sky7/game/Game.java b/src/main/java/sky7/game/Game.java
@@ -26,6 +26,7 @@ public class Game implements IGame {
     private IBoard board;
     private List<Integer> destroyedRobots = new ArrayList<>();
     private boolean hosting;
+    private boolean disableDamage = true;
 
     /**
      * The construct for a game engine on host.
@@ -284,6 +285,7 @@ private void expressConveyor() {
     }
 
     private void applyDamage(int playerID, int damage) {
+        if (disableDamage) return;
         if (hosting) {
             host.applyDamage(playerID, damage);
         } else if (client.getPlayer().getPlayerNumber() == playerID) client.applyDamage(playerID, damage);

diff --git a/src/main/java/sky7/host/HostNetHandler.java b/src/main/java/sky7/host/HostNetHandler.java
@@ -79,6 +79,7 @@ public void connected (Connection connection) {
             NumberOfPlayers nop = new NumberOfPlayers();
             nop.nPlayers = server.getConnections().length+1;
             server.sendToAllTCP(nop);
+            connection.setKeepAliveTCP(5000);
         }
 
         public void disconnected (Connection connection) {