From 1f755a776b6779e1f918e33c4e0a2c05aee77c5b Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 4 Mar 2022 23:00:20 +0100 Subject: [PATCH] Fix techhider, Post fight message, Signed-off-by: Lixfel --- .../steamwar/fightsystem/utils/TechHider9.java | 2 +- .../fightsystem/record/PacketProcessor.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/FightSystem_9/src/de/steamwar/fightsystem/utils/TechHider9.java b/FightSystem_9/src/de/steamwar/fightsystem/utils/TechHider9.java index c07bcb2..e9b0ba9 100644 --- a/FightSystem_9/src/de/steamwar/fightsystem/utils/TechHider9.java +++ b/FightSystem_9/src/de/steamwar/fightsystem/utils/TechHider9.java @@ -55,7 +55,7 @@ public class TechHider9 extends TechHider8 { packet = mapChunkCloner.apply(packet); mapChunkBlockEntities.set(packet, ((List)mapChunkBlockEntities.get(packet)).stream().filter( - nbttag -> Config.HiddenBlockEntities.contains((String) nbtTagGetString.invoke(nbttag, "id")) + nbttag -> !Config.HiddenBlockEntities.contains((String) nbtTagGetString.invoke(nbttag, "id")) ).collect(Collectors.toList())); byte[] data = dataHider(mapChunkData.get(packet), mapChunkBitMask.get(packet)); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java index a1f02e2..c70e4f4 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java @@ -152,15 +152,6 @@ public class PacketProcessor { winner = Fight.getRedTeam(); FightSystem.setSpectateState(winner, "Replay ends", message.getMsg(), message.getParams()); - if (winner != null) { - FightUI.getInstance().setBossbar(0.5, 0.5, - new Message("BAR_WIN", winner.getColoredName(), Fight.getBlueTeam().getColoredName(), Fight.getRedTeam().getColoredName(), ""), - new Message("BAR_WIN", winner.getColoredName(), Fight.getRedTeam().getColoredName(), Fight.getBlueTeam().getColoredName(), "")); - } else { - FightUI.getInstance().setBossbar(0.5, 0.5, - new Message("BAR_TIE", "", Fight.getBlueTeam().getColoredName(), Fight.getRedTeam().getColoredName()), - new Message("BAR_TIE", "", Fight.getRedTeam().getColoredName(), Fight.getBlueTeam().getColoredName())); - } }); } @@ -490,6 +481,15 @@ public class PacketProcessor { if(!Config.replayserver()) { FightSystem.getMessage().broadcast("REPLAY_ENDS"); } + if (FightSystem.getLastWinner() != null) { + FightUI.getInstance().setBossbar(0.5, 0.5, + new Message("BAR_WIN", FightSystem.getLastWinner().getColoredName(), Fight.getBlueTeam().getColoredName(), Fight.getRedTeam().getColoredName(), ""), + new Message("BAR_WIN", FightSystem.getLastWinner().getColoredName(), Fight.getRedTeam().getColoredName(), Fight.getBlueTeam().getColoredName(), "")); + } else { + FightUI.getInstance().setBossbar(0.5, 0.5, + new Message("BAR_TIE", "", Fight.getBlueTeam().getColoredName(), Fight.getRedTeam().getColoredName()), + new Message("BAR_TIE", "", Fight.getRedTeam().getColoredName(), Fight.getBlueTeam().getColoredName())); + } FightState.setFightState(FightState.SPECTATE); currentProcessor = null; }