SteamWar/FightSystem
Archiviert
13
1

New Fight UI #288

Zusammengeführt
Lixfel hat 9 Commits von newFightUI nach master 2021-10-01 17:25:56 +02:00 zusammengeführt
4 geänderte Dateien mit 9 neuen und 6 gelöschten Zeilen
Nur Änderungen aus Commit efc601e090 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -64,7 +64,7 @@ public class FightUI {
setupTeamBar(red, leftRed, redHearts / totalHearts); setupTeamBar(red, leftRed, redHearts / totalHearts);
int timeLeft = StateDependentCountdown.getMainCountdown() != null ? StateDependentCountdown.getMainCountdown().getTimeLeft() : 0; int timeLeft = StateDependentCountdown.getMainCountdown() != null ? StateDependentCountdown.getMainCountdown().getTimeLeft() : 0;
String time = "§7" + (timeLeft/60) + "§8:§7" + (timeLeft%60); String time = "§7" + (timeLeft/60) + "§8:§7" + (timeLeft%60<10 ? "0" : "") + (timeLeft%60);
String bluePlayers = blue.getPrefix() + blue.getAlivePlayers() + "§8/§7" + blue.getPlayerCount(); String bluePlayers = blue.getPrefix() + blue.getAlivePlayers() + "§8/§7" + blue.getPlayerCount();
String redPlayers = red.getPrefix() + red.getAlivePlayers() + "§8/§7" + red.getPlayerCount(); String redPlayers = red.getPrefix() + red.getAlivePlayers() + "§8/§7" + red.getPlayerCount();
String redAdditional = Wincondition.getPrintableWinconditions().stream().map(w -> w.getDisplay(red)).collect(Collectors.joining(" ")); String redAdditional = Wincondition.getPrintableWinconditions().stream().map(w -> w.getDisplay(red)).collect(Collectors.joining(" "));
@ -99,7 +99,9 @@ public class FightUI {
BossBar posZ = Config.blueNegZ() ? leftRed : leftBlue; BossBar posZ = Config.blueNegZ() ? leftRed : leftBlue;
for(Player player : Bukkit.getOnlinePlayers()) { for(Player player : Bukkit.getOnlinePlayers()) {
float headRot = CraftbukkitWrapper.impl.headRotation(player); float headRot = CraftbukkitWrapper.impl.headRotation(player) % 360;
if(headRot < 0)
headRot += 360;
BossBar current = players.remove(player); BossBar current = players.remove(player);
if(headRot >= 180){ //negZ links if(headRot >= 180){ //negZ links
@ -190,7 +192,8 @@ public class FightUI {
} }
String message = queue.poll(); String message = queue.poll();
Bukkit.getOnlinePlayers().forEach(p -> p.sendTitle(null, message, 10, 80, 10)); //TODO: Sendtitle so nicht in <1.10 verfügbar!
Bukkit.getOnlinePlayers().forEach(p -> p.sendTitle("", message, 10, 80, 10));
Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), FightUI::printSubtitle, 100); Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), FightUI::printSubtitle, 100);
subtitleScheduled = true; subtitleScheduled = true;
} }