Skip to content

Commit

Permalink
non partied players can be seen.
Browse files Browse the repository at this point in the history
  • Loading branch information
mysticdrew committed Oct 18, 2023
1 parent d58a813 commit 1f55cb6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public boolean isVisible(Player localPlayer, Player remotePlayer, boolean isOp,
{
var allied = localTeam.isAlly(remotePlayer.getUUID()) || remoteTeam.isAlly(localPlayer.getUUID());

if ((remoteTeam.getId() == localTeam.getId() || allied) || isOp)
if ((remoteTeam.getId() == localTeam.getId() || allied) || isOp || (remoteTeam.getType().isPlayer() && !remoteTeam.getType().isParty()))
{
return visible;
}
Expand Down
26 changes: 13 additions & 13 deletions common/src/main/resources/assets/journeymapteams/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
"label.color.white": "§fWhite",
"prop.category.label.ftb": "JourneyMap FTB Teams",
"prop.category.label.ftb.tooltip": "Edit the Client defaults for FTB Teams integration.",
"prop.option.label.ftb.default.team_color": "Default Team Color",
"prop.option.label.ftb.default.team_color.tooltip": "This is used if there is a failure to get the team color.",
"prop.option.label.ftb.ally_color": "Ally Color",
"prop.option.label.ftb.ally_color.tooltip": "This is the color that is used for Allies if override is enabled.",
"prop.option.label.ftb.override_ally": "Override Default Ally Color",
"prop.option.label.ftb.override_ally.tooltip": "By default allies are the color of their team. Use this if you want to set the color for all allies.",
"prop.category.label.vanilla": "JourneyMap Vanilla Teams",
"prop.category.label.vanilla.tooltip": "Edit the Client defaults for Vanilla Teams integration.",
"prop.option.label.vanilla.default.team_color": "Default Team Color",
"prop.option.label.vanilla.default.team_color.tooltip": "This is used if there is a failure to get the team color.",
"prop.option.label.vanilla.ally_color": "Ally Color",
"prop.option.label.vanilla.ally_color.tooltip": "This is the color that is used for Allies if override is enabled.",
"prop.option.label.vanilla.override_ally": "Override Default Ally Color",
"prop.option.label.vanilla.override_ally.tooltip": "By default allies are the color of their team. Use this if you want to set the color for all allies."
}
"prop.option.label.default.team_color": "Team Color",
"prop.option.label.default.team_color.tooltip": "This is used when forcing team color, or if there is a failure getting the color from the team.",
"prop.option.label.ally_color": "Ally Color",
"prop.option.label.ally_color.tooltip": "This is used when forcing ally color, or if there is a failure getting the color from the team.",
"prop.option.label.force_ally": "Force Ally Color",
"prop.option.label.force_ally.tooltip": "By default allies are the color of their team. Use this if you want to set the color for all allies.",
"prop.option.label.force_team": "Force Team Color",
"prop.option.label.force_team.tooltip": "By default teammates are the color of the team. Use this if you want to set the color for all teammates.",
"prop.option.label.show_icon_color": "Color Player Icons",
"prop.option.label.show_icon_color.tooltip": "Disabling setting the color of Player Icons on the map.",
"prop.option.label.show_name_color": "Color Player Names",
"prop.option.label.show_name_color.tooltip": "Disabling setting the color of Player Names on the map."
}
2 changes: 2 additions & 0 deletions doc/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ <h1>JourneyMap Teams ${version} for Minecraft ${mcversion}</h1>
<ul>
<li>Added Vanilla Teams Support.</li>
<li>Added FTB Teams Support</li>
<li>Fixed: Fabric issues</li>
<li>Non-partied players are visible on the map.</li>
</ul>

0 comments on commit 1f55cb6

Please sign in to comment.