From 3530ed2b418200d591d8df782aa29abb192bd0da Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Mon, 27 Apr 2020 18:40:23 +0200 Subject: [PATCH] =?UTF-8?q?Utf=C3=B8rer=20sm=C3=A5=20endringer.=20Fikser?= =?UTF-8?q?=20en=20manglende=20vegg=20i=20Vault=20Assault?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roborally/gamewrapper/screens/BoardActiveScreen.java | 2 +- .../fiasko/roborally/networking/RoboRallyClientListener.java | 1 + src/main/java/inf112/fiasko/roborally/objects/Board.java | 4 ++-- src/main/resources/boards/Vault_Assault.txt | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java index 6eab8fa..a9318ed 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java @@ -81,8 +81,8 @@ public class BoardActiveScreen extends InteractiveScreen { roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getPowerDownScreen(roboRallyWrapper)); break; case SKIP_STAY_IN_POWER_DOWN: - roboRallyWrapper.client.sendElement(false); roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(roboRallyWrapper)); + roboRallyWrapper.client.sendElement(false); break; default: //Ignored diff --git a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClientListener.java b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClientListener.java index 2695dcd..181ab29 100644 --- a/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClientListener.java +++ b/src/main/java/inf112/fiasko/roborally/networking/RoboRallyClientListener.java @@ -110,6 +110,7 @@ class RoboRallyClientListener extends Listener { */ private void receiveHand(ProgrammingCardDeck newHand) { new Thread(() -> { + //Prevents a bug where the game while (wrapper.roboRallyGame.getGameState() != GameState.WAITING_FOR_CARDS_FROM_SERVER) { try { TimeUnit.MILLISECONDS.sleep(100); diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java index 5cdddd8..6822ef3 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Board.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java @@ -869,8 +869,8 @@ public class Board { case WALL_LASER_TRIPLE: laserParticleType = ParticleType.LASER_BEAM_TRIPLE; break; - default: - throw new IllegalArgumentException("Invalid laser type encountered."); + default: + throw new IllegalArgumentException("Invalid laser type encountered."); } Particle laserParticle = new Particle(laserParticleType, laserDirection); int positionX = addPosition.getXCoordinate(); diff --git a/src/main/resources/boards/Vault_Assault.txt b/src/main/resources/boards/Vault_Assault.txt index a775512..dd61c50 100644 --- a/src/main/resources/boards/Vault_Assault.txt +++ b/src/main/resources/boards/Vault_Assault.txt @@ -23,7 +23,7 @@ 0 0 1;3 0 0 0 0 0 0 5;7 0 0 0 0 5;3 0 0 0 0 0 0 6;7 0 0 3;7 0 0 0 2;6 0 0 2;4 0 0 0 3;3 -0 0 0 0 0 0 0 0 0 0 0 0 +0 0 1;5 0 0 0 0 0 0 0 0 0 1;7 0 0 0 0 1;1 5;1 0 0 0 0 1;3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3;5 0 1;5 0 0 1;5 0 1;5 0 0