From efc601e090b9fb290bbbc51e4b47b68bf79a6dc1 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 30 Sep 2021 13:20:28 +0200 Subject: [PATCH] Fix rotational and additional issues Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/utils/FightUI.java | 9 ++++++--- .../fightsystem/winconditions/WinconditionPoints.java | 2 +- .../winconditions/WinconditionPumpkinTechKO.java | 2 +- .../winconditions/WinconditionWaterTechKO.java | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java b/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java index ecdccb4..3fa9084 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java @@ -64,7 +64,7 @@ public class FightUI { setupTeamBar(red, leftRed, redHearts / totalHearts); 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 redPlayers = red.getPrefix() + red.getAlivePlayers() + "§8/§7" + red.getPlayerCount(); 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; 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); if(headRot >= 180){ //negZ links @@ -190,7 +192,8 @@ public class FightUI { } 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); subtitleScheduled = true; } diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java b/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java index 4e1902f..6430a17 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java @@ -105,7 +105,7 @@ public class WinconditionPoints extends Wincondition implements PrintableWincond @Override public String getDisplay(FightTeam team) { - return team.getPrefix() + teamMap.get(team).getPoints() + "§8Punkte"; + return team.getPrefix() + teamMap.get(team).getPoints() + " §8Punkte"; } private class TeamPoints { diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumpkinTechKO.java b/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumpkinTechKO.java index 2596e2e..82db796 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumpkinTechKO.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumpkinTechKO.java @@ -56,7 +56,7 @@ public class WinconditionPumpkinTechKO extends Wincondition implements Printable @Override public String getDisplay(FightTeam team) { - return team.getPrefix() + teamMap.get(team).pumpkins + "§8Kanonen"; + return team.getPrefix() + teamMap.get(team).pumpkins + " §8Kanonen"; } private class TeamPumpkin { diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java b/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java index 1719e40..9367406 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java @@ -54,7 +54,7 @@ public class WinconditionWaterTechKO extends Wincondition implements PrintableWi @Override public String getDisplay(FightTeam team) { - return team.getPrefix() + teamMap.get(team).water + "§8Wasser"; + return team.getPrefix() + teamMap.get(team).water + " §8Wasser"; } private class TeamWater {