SteamWar/FightSystem
Archiviert
13
1

Fix rotational and additional issues
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Lixfel 2021-09-30 13:20:28 +02:00
Ursprung a37ae72b6a
Commit efc601e090
4 geänderte Dateien mit 9 neuen und 6 gelöschten Zeilen

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;
} }

Datei anzeigen

@ -105,7 +105,7 @@ public class WinconditionPoints extends Wincondition implements PrintableWincond
@Override @Override
public String getDisplay(FightTeam team) { public String getDisplay(FightTeam team) {
return team.getPrefix() + teamMap.get(team).getPoints() + "§8Punkte"; return team.getPrefix() + teamMap.get(team).getPoints() + " §8Punkte";
} }
private class TeamPoints { private class TeamPoints {

Datei anzeigen

@ -56,7 +56,7 @@ public class WinconditionPumpkinTechKO extends Wincondition implements Printable
@Override @Override
public String getDisplay(FightTeam team) { public String getDisplay(FightTeam team) {
return team.getPrefix() + teamMap.get(team).pumpkins + "§8Kanonen"; return team.getPrefix() + teamMap.get(team).pumpkins + " §8Kanonen";
} }
private class TeamPumpkin { private class TeamPumpkin {

Datei anzeigen

@ -54,7 +54,7 @@ public class WinconditionWaterTechKO extends Wincondition implements PrintableWi
@Override @Override
public String getDisplay(FightTeam team) { public String getDisplay(FightTeam team) {
return team.getPrefix() + teamMap.get(team).water + "§8Wasser"; return team.getPrefix() + teamMap.get(team).water + " §8Wasser";
} }
private class TeamWater { private class TeamWater {