JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PC-409 

Fixes an issue where the game lobby scoreboard would not account for
players in /vanish.
This commit is contained in:
Sam 2016-06-01 14:51:22 +01:00
parent 1a9f58451b
commit df9fe45d7e
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -1212,6 +1212,11 @@ public class ArcadeManager extends MiniPlugin implements IRelation
} }
return _specList.contains(player); return _specList.contains(player);
} }
public boolean isVanished(Player player)
{
return _incognitoManager.Get(player).Status;
}
public boolean IsTournamentServer() public boolean IsTournamentServer()
{ {

15
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
View File

@ -1047,6 +1047,15 @@ public class GameLobbyManager implements Listener
_colorTick = !_colorTick; _colorTick = !_colorTick;
int spectatorCount = 0;
for(Player players : UtilServer.GetPlayers())
{
{
spectatorCount++;
}
}
for (Entry<Player, Scoreboard> entry : _scoreboardMap.entrySet()) for (Entry<Player, Scoreboard> entry : _scoreboardMap.entrySet())
{ {
Objective objective = entry.getValue().getObjective("§l" + "Lobby"); Objective objective = entry.getValue().getObjective("§l" + "Lobby");
@ -1079,7 +1088,8 @@ public class GameLobbyManager implements Listener
// Remove Old // Remove Old
entry.getValue().resetScores(_oldPlayerCount + "/" + _oldMaxPlayerCount); entry.getValue().resetScores(_oldPlayerCount + "/" + _oldMaxPlayerCount);
// Set new // Set new
objective.getScore(UtilServer.getPlayers().length + "/" + Manager.GetPlayerFull()).setScore(line--);
objective.getScore(UtilServer.getPlayers().length - spectatorCount + "/" + Manager.GetPlayerFull()).setScore(line--);
if (Manager.GetGame() != null) if (Manager.GetGame() != null)
{ {
@ -1150,7 +1160,7 @@ public class GameLobbyManager implements Listener
} }
} }
_oldPlayerCount = UtilServer.getPlayers().length; _oldPlayerCount = UtilServer.getPlayers().length - spectatorCount;
_oldMaxPlayerCount = Manager.GetPlayerFull(); _oldMaxPlayerCount = Manager.GetPlayerFull();
} }
@ -1364,5 +1374,4 @@ public class GameLobbyManager implements Listener
event.setCancelled(true); event.setCancelled(true);
} }
} }