From 8b30e77bc518a98512770cbbed8236dc116c426d Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Sat, 23 Feb 2019 12:00:21 +0100 Subject: [PATCH] Not stable version Signed-off-by: Yaruma3341 --- src/me/yaruma/fightsystem/listener/PlayerJoinListener.java | 5 ++--- src/me/yaruma/fightsystem/utils/countdown/Countdown.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java index 9325e8b..636110f 100644 --- a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java +++ b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java @@ -32,14 +32,13 @@ public class PlayerJoinListener implements Listener { if (Fight.getPlayerTeam(player) == null) { if(!Fight.getRedTeam().hasTeamLeader()) { Fight.getRedTeam().setLeader(new FightPlayer(player, false)); - return; + player.setGameMode(GameMode.ADVENTURE); } else if(!Fight.getBlueTeam().hasTeamLeader()) { Fight.getBlueTeam().setLeader(new FightPlayer(player, false)); - return; + player.setGameMode(GameMode.ADVENTURE); } else { player.setGameMode(GameMode.SPECTATOR); player.teleport(instance.getSpecSpawnLoc()); - return; } } diff --git a/src/me/yaruma/fightsystem/utils/countdown/Countdown.java b/src/me/yaruma/fightsystem/utils/countdown/Countdown.java index 6059649..21ee70c 100644 --- a/src/me/yaruma/fightsystem/utils/countdown/Countdown.java +++ b/src/me/yaruma/fightsystem/utils/countdown/Countdown.java @@ -32,7 +32,7 @@ public class Countdown { switch (time) { case 600: case 300: - Bukkit.broadcastMessage("§6Noch §a" + time / 60 + " §6Minuten" + countdownCallback.countdownCounting()); + Bukkit.broadcastMessage("§6Noch §a" + time / 60 + " §6Minuten " + countdownCallback.countdownCounting()); break; case 60: case 30: case 20: case 15: case 10: case 5: case 4: case 3: case 2: Bukkit.broadcastMessage("§6Noch §a" + time + " §6Sekunden " + countdownCallback.countdownCounting());