Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
This commit is contained in:
commit
b51007da91
@ -56,16 +56,6 @@ public class PlayerScoreboard
|
||||
String rankName = _manager.getClients().Get(player).GetRank().Name;
|
||||
String otherRankName = _manager.getClients().Get(otherPlayer).GetRank().Name;
|
||||
|
||||
if (!_manager.getClients().Get(player).GetRank().has(Rank.ULTRA) && _manager.getDonation().Get(player.getName()).OwnsUltraPackage())
|
||||
{
|
||||
rankName = Rank.ULTRA.Name;
|
||||
}
|
||||
|
||||
if (!_manager.getClients().Get(otherPlayer).GetRank().has(Rank.ULTRA) && _manager.getDonation().Get(otherPlayer.getName()).OwnsUltraPackage())
|
||||
{
|
||||
otherRankName = Rank.ULTRA.Name;
|
||||
}
|
||||
|
||||
//Add Other to Self
|
||||
_scoreboard.getTeam(otherRankName).addPlayer(otherPlayer);
|
||||
|
||||
|
@ -535,16 +535,6 @@ public class HubManager extends MiniClientPlugin<HubClient>
|
||||
String rankName = _clientManager.Get(player).GetRank().Name;
|
||||
String otherRankName = _clientManager.Get(otherPlayer).GetRank().Name;
|
||||
|
||||
if (!_clientManager.Get(player).GetRank().has(Rank.ULTRA) && _donationManager.Get(player.getName()).OwnsUltraPackage())
|
||||
{
|
||||
rankName = Rank.ULTRA.Name;
|
||||
}
|
||||
|
||||
if (!_clientManager.Get(otherPlayer).GetRank().has(Rank.ULTRA) && _donationManager.Get(otherPlayer.getName()).OwnsUltraPackage())
|
||||
{
|
||||
otherRankName = Rank.ULTRA.Name;
|
||||
}
|
||||
|
||||
//Add Other to Self
|
||||
board.getTeam(otherRankName).addPlayer(otherPlayer);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user