Skip to content
This repository was archived by the owner on Jun 7, 2022. It is now read-only.

Commit de2707b

Browse files
author
Dytanic
committed
added new updateNameTags method, for handle the all players
1 parent ea43883 commit de2707b

File tree

1 file changed

+11
-4
lines changed
  • cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge

1 file changed

+11
-4
lines changed

cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/CloudServer.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ public static CloudServer getInstance()
431431
}
432432

433433
/**
434-
*
435434
* @param player
436435
*/
437436
public void updateNameTags(Player player)
@@ -440,14 +439,19 @@ public void updateNameTags(Player player)
440439
}
441440

442441
public void updateNameTags(Player player, Function<Player, PermissionGroup> playerPermissionGroupFunction)
442+
{
443+
this.updateNameTags(player, playerPermissionGroupFunction, null);
444+
}
445+
446+
public void updateNameTags(Player player, Function<Player, PermissionGroup> playerPermissionGroupFunction, Function<Player, PermissionGroup> allOtherPlayerPermissionGroupFunction)
443447
{
444448
if (CloudAPI.getInstance().getPermissionPool() == null || !CloudAPI.getInstance().getPermissionPool().isAvailable())
445449
return;
446450

447451
PermissionGroup playerPermissionGroup = playerPermissionGroupFunction != null ? playerPermissionGroupFunction.apply(player) : null;
448452

449453
if (playerPermissionGroup == null)
450-
playerPermissionGroup = CloudServer.getInstance().getCloudPlayers().get(player.getUniqueId())
454+
playerPermissionGroup = getCloudPlayers().get(player.getUniqueId())
451455
.getPermissionEntity().getHighestPermissionGroup(CloudAPI.getInstance().getPermissionPool());
452456

453457
initScoreboard(player);
@@ -459,8 +463,11 @@ public void updateNameTags(Player player, Function<Player, PermissionGroup> play
459463
if (playerPermissionGroup != null)
460464
addTeamEntry(player, all, playerPermissionGroup);
461465

462-
PermissionGroup targetPermissionGroup = CloudServer.getInstance().getCachedPlayer(all.getUniqueId())
463-
.getPermissionEntity().getHighestPermissionGroup(CloudAPI.getInstance().getPermissionPool());
466+
PermissionGroup targetPermissionGroup = allOtherPlayerPermissionGroupFunction != null ? allOtherPlayerPermissionGroupFunction.apply(all) : null;
467+
468+
if (targetPermissionGroup == null)
469+
targetPermissionGroup = getCachedPlayer(all.getUniqueId())
470+
.getPermissionEntity().getHighestPermissionGroup(CloudAPI.getInstance().getPermissionPool());
464471

465472
if (targetPermissionGroup != null)
466473
addTeamEntry(all, player, targetPermissionGroup);

0 commit comments

Comments
 (0)