From cd5399d1a837d371745c6a8ddb7d6b094bc9ae9a Mon Sep 17 00:00:00 2001
From: Yaruma3341 <yaruma3341@gmail.com>
Date: Sun, 24 Mar 2019 21:54:01 +0100
Subject: [PATCH] bug fixes

Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
---
 src/me/yaruma/fightsystem/FightSystem.java                 | 2 ++
 src/me/yaruma/fightsystem/listener/PlayerJoinListener.java | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/me/yaruma/fightsystem/FightSystem.java b/src/me/yaruma/fightsystem/FightSystem.java
index b70d886..e938894 100644
--- a/src/me/yaruma/fightsystem/FightSystem.java
+++ b/src/me/yaruma/fightsystem/FightSystem.java
@@ -172,6 +172,8 @@ public class FightSystem extends JavaPlugin {
         Countdown countdown = new Countdown(setupDuration, new FinishNoPlayersOnline());
         countdown.startTimer(getPlugin());
 
+        world.setSpawnLocation(getSpecSpawnLoc());
+
         System.out.println(PREFIX + "§aPlugin gestartet!");
     }
 
diff --git a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
index 45c4c8c..1c3f314 100644
--- a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
+++ b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
@@ -43,7 +43,6 @@ public class PlayerJoinListener implements Listener {
                 player.setGameMode(GameMode.SPECTATOR);
                 player.teleport(instance.getSpecSpawnLoc());
             }
-            return;
         }
 
         FightTeam fightTeam = Fight.getPlayerTeam(player);