@@ -431,7 +431,6 @@ public static CloudServer getInstance()
431
431
}
432
432
433
433
/**
434
- *
435
434
* @param player
436
435
*/
437
436
public void updateNameTags (Player player )
@@ -440,14 +439,19 @@ public void updateNameTags(Player player)
440
439
}
441
440
442
441
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 )
443
447
{
444
448
if (CloudAPI .getInstance ().getPermissionPool () == null || !CloudAPI .getInstance ().getPermissionPool ().isAvailable ())
445
449
return ;
446
450
447
451
PermissionGroup playerPermissionGroup = playerPermissionGroupFunction != null ? playerPermissionGroupFunction .apply (player ) : null ;
448
452
449
453
if (playerPermissionGroup == null )
450
- playerPermissionGroup = CloudServer . getInstance (). getCloudPlayers ().get (player .getUniqueId ())
454
+ playerPermissionGroup = getCloudPlayers ().get (player .getUniqueId ())
451
455
.getPermissionEntity ().getHighestPermissionGroup (CloudAPI .getInstance ().getPermissionPool ());
452
456
453
457
initScoreboard (player );
@@ -459,8 +463,11 @@ public void updateNameTags(Player player, Function<Player, PermissionGroup> play
459
463
if (playerPermissionGroup != null )
460
464
addTeamEntry (player , all , playerPermissionGroup );
461
465
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 ());
464
471
465
472
if (targetPermissionGroup != null )
466
473
addTeamEntry (all , player , targetPermissionGroup );
0 commit comments