Skip to content

refactor(team): simplify viewable rule assignment logic in TeamHelper #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theEvilReaper merged 2 commits into from
Aug 9, 2026
+2 −21
Merged

refactor(team): simplify viewable rule assignment logic in TeamHelper #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cacf0aa
refactor(game): remove redundant viewable rule methods and consolidat…
TheMeinerLP Aug 9, 2026
57d7566
refactor(team): simplify viewable rule assignment logic in TeamHelper
TheMeinerLP Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions game/src/main/java/net/onelitefeather/cygnus/team/TeamHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
20 changes: 1 addition & 19 deletions game/src/main/java/net/onelitefeather/cygnus/utils/ViewRuleUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading