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

Fix techhider, Post fight message,
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen 
Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Lixfel 2022-03-04 23:00:20 +01:00
Ursprung b6bbf79473
Commit 1f755a776b
2 geänderte Dateien mit 10 neuen und 10 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
FightSystem_9/src/de/steamwar/fightsystem/utils/TechHider9.java
Datei anzeigen

@ -55,7 +55,7 @@ public class TechHider9 extends TechHider8 {
packet = mapChunkCloner.apply(packet); packet = mapChunkCloner.apply(packet);
mapChunkBlockEntities.set(packet, ((List<?>)mapChunkBlockEntities.get(packet)).stream().filter( 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())); ).collect(Collectors.toList()));
byte[] data = dataHider(mapChunkData.get(packet), mapChunkBitMask.get(packet)); byte[] data = dataHider(mapChunkData.get(packet), mapChunkBitMask.get(packet));

18
FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
Datei anzeigen

@ -152,15 +152,6 @@ public class PacketProcessor {
winner = Fight.getRedTeam(); winner = Fight.getRedTeam();
FightSystem.setSpectateState(winner, "Replay ends", message.getMsg(), message.getParams()); 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()) { if(!Config.replayserver()) {
FightSystem.getMessage().broadcast("REPLAY_ENDS"); 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); FightState.setFightState(FightState.SPECTATE);
currentProcessor = null; currentProcessor = null;
} }