From cacf0aa4e340cfb2221f4da0af6efae0791c74f9 Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Sun, 9 Aug 2026 18:38:24 +0200 Subject: [PATCH 1/2] refactor(game): remove redundant viewable rule methods and consolidate logic --- .../cygnus/utils/ViewRuleUpdater.java | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/game/src/main/java/net/onelitefeather/cygnus/utils/ViewRuleUpdater.java b/game/src/main/java/net/onelitefeather/cygnus/utils/ViewRuleUpdater.java index cee972ac..7318bc9a 100644 --- a/game/src/main/java/net/onelitefeather/cygnus/utils/ViewRuleUpdater.java +++ b/game/src/main/java/net/onelitefeather/cygnus/utils/ViewRuleUpdater.java @@ -17,29 +17,11 @@ public static void updateViewer(Player target, Team survivor) { if (onlinePlayer.getUuid().equals(target.getUuid())) continue; onlinePlayer.updateViewableRule(); } - survivor.getPlayers().forEach(ViewRuleUpdater::showSlender); - showSurvivor(target); target.updateViewableRule(); survivor.getPlayers().forEach(Player::updateViewableRule); } - public static void showSurvivor(Player player) { - if (isViewAble(player)) { - player.setTag(Tags.HIDDEN, SlenderBarHelper.VISIBLE); - } else { - player.setTag(Tags.HIDDEN, SlenderBarHelper.HIDDEN); - } - } - - public static void showSlender(Player player) { - if (!isViewAble(player)) { - player.setTag(Tags.HIDDEN, SlenderBarHelper.HIDDEN); - } else { - player.setTag(Tags.HIDDEN, SlenderBarHelper.VISIBLE); - } - } - - public static boolean viewableRuleForSlender(Player player) { + public static boolean isHidden(Player player) { return player.hasTag(Tags.HIDDEN) && player.getTag(Tags.HIDDEN) == SlenderBarHelper.HIDDEN; } From 57d75667decb83c2484d3fa35b71e7e2d42177da Mon Sep 17 00:00:00 2001 From: TheMeinerLP Date: Sun, 9 Aug 2026 18:38:27 +0200 Subject: [PATCH 2/2] refactor(team): simplify viewable rule assignment logic in TeamHelper --- .../main/java/net/onelitefeather/cygnus/team/TeamHelper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/game/src/main/java/net/onelitefeather/cygnus/team/TeamHelper.java b/game/src/main/java/net/onelitefeather/cygnus/team/TeamHelper.java index cc419b3a..79882d4d 100644 --- a/game/src/main/java/net/onelitefeather/cygnus/team/TeamHelper.java +++ b/game/src/main/java/net/onelitefeather/cygnus/team/TeamHelper.java @@ -5,7 +5,6 @@ import net.theevilreaper.aves.util.Players; import net.theevilreaper.xerus.api.team.Team; import net.theevilreaper.xerus.api.team.TeamService; -import net.kyori.adventure.key.Key; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.minestom.server.MinecraftServer; @@ -75,7 +74,7 @@ private static Player selectSlenderPlayer() { */ private static void assignSlender(Player player, Team slenderTeam) { player.setTag(Tags.TEAM_KEY, GameConfig.SLENDER_KEY); - player.updateViewableRule(ViewRuleUpdater::viewableRuleForSlender); + player.updateViewableRule(_ -> !ViewRuleUpdater.isHidden(player)); slenderTeam.addPlayer(player); }