From 1cb8b79f619f04fe4ba9cd76dcdaa8a5c60cb5de Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Sat, 23 Feb 2019 12:14:33 +0100 Subject: [PATCH] Not stable version Signed-off-by: Yaruma3341 --- .../listener/PlayerJoinListener.java | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java index 636110f..9ee3e0b 100644 --- a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java +++ b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java @@ -43,25 +43,16 @@ public class PlayerJoinListener implements Listener { } FightTeam fightTeam = Fight.getPlayerTeam(player); - FightPlayer fightPlayer = fightTeam.getFightPlayer(player); - if (fightTeam == Fight.blueTeam) { - if (instance.getFightState() == FightState.SETUP) { - player.teleport(instance.getFightManager().getBlueTeleportLocation()); - player.setGameMode(GameMode.SURVIVAL); - if(fightPlayer.isLeader()) SetupItems.giveSetupItems(player); - if(fightPlayer.isOut()) { - fightPlayer.setOut(false); - Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + fightPlayer.getPlayer().getName() + " §aist dem Kampf wieder beigetreten!"); - } - } else { - player.setGameMode(GameMode.SPECTATOR); - player.teleport(FightSystem.getPlugin().getTeam2SpawnLoc()); - } - } - if (fightTeam == Fight.redTeam) { - if (instance.getFightState() == FightState.SETUP) { - player.teleport(instance.getFightManager().getRedTeleportLocation()); + if(Fight.getPlayerTeam(player) != null) { + FightPlayer fightPlayer = fightTeam.getFightPlayer(player); + + if(instance.getFightState() == FightState.SETUP) { + if(fightTeam == Fight.redTeam) { + player.teleport(instance.getFightManager().getRedTeleportLocation()); + } else + player.teleport(instance.getFightManager().getBlueTeleportLocation()); + player.setGameMode(GameMode.SURVIVAL); if(fightPlayer.isLeader()) SetupItems.giveSetupItems(player); if(fightPlayer.isOut()) { @@ -70,8 +61,12 @@ public class PlayerJoinListener implements Listener { } } else { player.setGameMode(GameMode.SPECTATOR); - player.teleport(instance.getTeam1SpawnLoc()); + if(fightTeam == Fight.redTeam) { + player.teleport(FightSystem.getPlugin().getTeam1SpawnLoc()); + } else + player.teleport(FightSystem.getPlugin().getTeam2SpawnLoc()); } + } if(Fight.getRedTeam().getLeader().getPlayer() != null && Fight.getBlueTeam().getLeader().getPlayer() != null) {