SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

hotfixes; reworked player join event

Quellcode durchsuchen 
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
Dieser Commit ist enthalten in:
Yaruma3341 2019-04-13 22:32:36 +02:00
Ursprung 42db4ba100
Commit 4dd63fb45e
2 geänderte Dateien mit 27 neuen und 45 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

42
src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
Datei anzeigen

@ -36,7 +36,10 @@ public class PlayerJoinListener implements Listener {
player.setFoodLevel(20); player.setFoodLevel(20);
player.getInventory().clear(); player.getInventory().clear();
if (Fight.getPlayerTeam(player) == null) {
FightTeam fightTeam = Fight.getPlayerTeam(player);
if (fightTeam == null) {
//TEXT COMPONENTS //TEXT COMPONENTS
TextComponent publicList = new TextComponent("public"); TextComponent publicList = new TextComponent("public");
@ -46,10 +49,10 @@ public class PlayerJoinListener implements Listener {
publicList.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/ak schemlist public")); publicList.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/ak schemlist public"));
TextComponent privateList = new TextComponent("private"); TextComponent privateList = new TextComponent("private");
publicList.setColor(ChatColor.GOLD); privateList.setColor(ChatColor.GOLD);
publicList.setBold(true); privateList.setBold(true);
publicList.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("§ePrivate Liste...").create())); privateList.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("§ePrivate Liste...").create()));
publicList.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/ak schemlist 0")); privateList.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/ak schemlist 0"));
//TEXT COMPONENTS //TEXT COMPONENTS
if(!Fight.getRedTeam().hasTeamLeader()) { if(!Fight.getRedTeam().hasTeamLeader()) {
@ -68,35 +71,6 @@ public class PlayerJoinListener implements Listener {
} }
} }
FightTeam fightTeam = Fight.getPlayerTeam(player);
if(fightTeam != null) {
FightPlayer fightPlayer = fightTeam.getFightPlayer(player);
if(instance.getFightState() == FightState.SETUP) {
if(fightTeam == Fight.redTeam) {
player.teleport(Config.TeamRedSpawn);
} else
player.teleport(Config.TeamBlueSpawn);
player.setGameMode(GameMode.ADVENTURE);
if(fightPlayer.isLeader()) SetupItems.giveSetupItems(player);
if(fightPlayer.isOut()) {
fightPlayer.setOut(false);
Countdown.cancelTimerType(CountdownType.NO_PLAYERS_ONLINE);
Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + fightPlayer.getPlayer().getName() + " §aist dem Kampf wieder beigetreten!");
} else
Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + fightPlayer.getPlayer().getName() + " §aist dem Kampf beigetreten!");
} else {
player.setGameMode(GameMode.SPECTATOR);
if(fightTeam == Fight.redTeam)
player.teleport(Config.TeamRedSpawn);
else
player.teleport(Config.TeamBlueSpawn);
}
}
if(Fight.getRedTeam().hasTeamLeader() && Fight.getBlueTeam().hasTeamLeader()) { if(Fight.getRedTeam().hasTeamLeader() && Fight.getBlueTeam().hasTeamLeader()) {
Countdown.cancelTimerType(CountdownType.NO_PLAYERS_ONLINE); Countdown.cancelTimerType(CountdownType.NO_PLAYERS_ONLINE);
Countdown countdown = new Countdown(Config.SetupDuration, new FinishSetupOver()); Countdown countdown = new Countdown(Config.SetupDuration, new FinishSetupOver());

30
src/me/yaruma/fightsystem/listener/PlayerQuitListener.java
Datei anzeigen

@ -38,25 +38,33 @@ public class PlayerQuitListener implements Listener {
fightTeam.removePlayer(player); fightTeam.removePlayer(player);
if(!fightTeam.getPlayers().isEmpty()) { if(!fightTeam.getPlayers().isEmpty()) {
fightTeam.setLeader(fightTeam.getPlayers().get(0)); fightTeam.setLeader(fightTeam.getPlayers().get(0));
Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + fightTeam.getPlayers().get(0).getPlayer().getDisplayName() + " §aist nun Leader von Team " + fightTeam.getName() == Fight.getRedTeam().getName() ? Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + fightTeam.getLeader().getPlayer().getDisplayName() + " §aist nun Leader von Team " + (fightTeam.getName() == Fight.getRedTeam().getName() ?
Config.TeamRedPrefix + Config.TeamRedName : Config.TeamBluePrefix + Config.TeamBlueName + "§a!"); Config.TeamRedPrefix + Config.TeamRedName : Config.TeamBluePrefix + Config.TeamBlueName + "§a!"));
} else { } else {
for(Player players : Bukkit.getServer().getOnlinePlayers()) { for(Player players : Bukkit.getServer().getOnlinePlayers()) {
if(Fight.getPlayerTeam(players) != null) { if(Fight.getPlayerTeam(players) == null) {
Bukkit.broadcastMessage(FightSystem.PREFIX + "§6Es gibt keine Spieler mehr die den Leader ersetzen können! \n Server stoppt..."); if(fightTeam.getLeader() == null) {
Bukkit.shutdown();
} else {
FightPlayer fightPlayer = new FightPlayer(players, false); FightPlayer fightPlayer = new FightPlayer(players, false);
fightTeam.setLeader(fightPlayer); fightTeam.setLeader(fightPlayer);
Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + players.getDisplayName() + " §aist nun Leader von Team " + fightTeam.getName() == Fight.getRedTeam().getName() ? Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + fightTeam.getLeader().getPlayer().getDisplayName() + " §aist nun Leader von Team " + (fightTeam.getName() == Fight.getRedTeam().getName() ?
Config.TeamRedPrefix + Config.TeamRedName : Config.TeamBluePrefix + Config.TeamBlueName + "§a!"); Config.TeamRedPrefix + Config.TeamRedName : Config.TeamBluePrefix + Config.TeamBlueName + "§a!"));
}
}
} }
} }
} }
if(fightTeam.allPlayersOut() && FightSystem.getPlugin().getFightState() == FightState.SETUP) { if(fightTeam.getLeader() == null) {
Bukkit.broadcastMessage(FightSystem.PREFIX + "§6Es gibt keine Spieler mehr die den Leader ersetzen können! \n Server stoppt...");
Bukkit.shutdown();
}
}
} else if(fightState == FightState.PRE_RUNNING || fightState == FightState.RUNNING) {
fightTeam.getFightPlayer(player).setOut(true);
if(!Config.AllDead && !Config.CaptainDead)
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cDer Spieler §6" + player.getName() + " §chat den Kampf verlassen!");
}
}
if(fightTeam.getPlayers().isEmpty() && FightSystem.getPlugin().getFightState() == FightState.SETUP) {
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cAlle Spieler aus dem Team " + fightTeam.getName() + " §chaben den Kampf verlassen!"); Bukkit.broadcastMessage(FightSystem.PREFIX + "§cAlle Spieler aus dem Team " + fightTeam.getName() + " §chaben den Kampf verlassen!");
Countdown countdown = new Countdown(30, new FinishNoPlayersOnline()); Countdown countdown = new Countdown(30, new FinishNoPlayersOnline());
countdown.startTimer(FightSystem.getPlugin()); countdown.startTimer(FightSystem.getPlugin());