loganmagnan/bed-wars
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gay queue manager?

Browse Source
This commit is contained in:
Luca 2021-11-22 17:13:55 +01:00
parent 6003f2f506
commit 5c5fc9a074
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/rip/tilly/bedwars/managers/queue/QueueManager.java
View File

@ -81,10 +81,6 @@ public class QueueManager {
} }
Player opponentPlayer = Bukkit.getPlayer(opponent); Player opponentPlayer = Bukkit.getPlayer(opponent);
GameTeam teamA = new GameTeam(player.getUniqueId(), Collections.singletonList(player.getUniqueId()), 0, PlayerTeam.RED);
GameTeam teamB = new GameTeam(player.getUniqueId(), Collections.singletonList(opponentPlayer.getUniqueId()), 1, PlayerTeam.LIME);
Arena arena = this.plugin.getArenaManager().getRandomArena(); Arena arena = this.plugin.getArenaManager().getRandomArena();
player.sendMessage(" "); player.sendMessage(" ");
@ -101,6 +97,9 @@ public class QueueManager {
opponentPlayer.sendMessage(CC.translate("&7⚫ &fGame: &d" + gameType.getName())); opponentPlayer.sendMessage(CC.translate("&7⚫ &fGame: &d" + gameType.getName()));
opponentPlayer.sendMessage(" "); opponentPlayer.sendMessage(" ");
GameTeam teamA = new GameTeam(player.getUniqueId(), Collections.singletonList(player.getUniqueId()), 0, PlayerTeam.RED);
GameTeam teamB = new GameTeam(player.getUniqueId(), Collections.singletonList(opponentPlayer.getUniqueId()), 1, PlayerTeam.LIME);
Game game = new Game(arena, gameType, teamA, teamB); Game game = new Game(arena, gameType, teamA, teamB);
this.plugin.getGameManager().createGame(game); this.plugin.getGameManager().createGame(game);
@ -108,7 +107,6 @@ public class QueueManager {
this.queued.remove(opponentPlayer.getUniqueId()); this.queued.remove(opponentPlayer.getUniqueId());
this.queueTime.remove(player.getUniqueId()); this.queueTime.remove(player.getUniqueId());
this.queueTime.remove(opponentPlayer.getUniqueId());
// if (this.getQueueSizeByType(gameType) >= gameType.getQueueAmount()) { // if (this.getQueueSizeByType(gameType) >= gameType.getQueueAmount()) {
// //

14
src/main/java/rip/tilly/bedwars/providers/scoreboard/ScoreboardProvider.java
View File

@ -75,8 +75,8 @@ public class ScoreboardProvider implements AssembleAdapter {
} }
lines.add("&fOnline: &d" + this.main.getServer().getOnlinePlayers().size()); lines.add("&fOnline: &d" + this.main.getServer().getOnlinePlayers().size());
lines.add("&fPlaying: &d" + this.main.getGameManager().getPlaying());
lines.add("&fQueueing: &d" + this.main.getQueueManager().getAllQueueSize()); lines.add("&fQueueing: &d" + this.main.getQueueManager().getAllQueueSize());
lines.add("&fPlaying: &d" + this.main.getGameManager().getPlaying());
lines.add(" "); lines.add(" ");
@ -115,18 +115,18 @@ public class ScoreboardProvider implements AssembleAdapter {
lines.add("&fDuration: &d" + game.getDuration()); lines.add("&fDuration: &d" + game.getDuration());
lines.add(" "); lines.add(" ");
if (yourTeam.isHasBed()) { if (yourTeam.isHasBed()) {
lines.add("&7" + yourTeam.getPlayerTeam().getChatColor() + yourTeam.getPlayerTeam().getSmallName() + "&7] &a&l✓ &7(You)"); lines.add("&7[" + yourTeam.getPlayerTeam().getChatColor() + yourTeam.getPlayerTeam().getSmallName() + "&7] &a&l✓ &7(You)");
} else if (yourTeam.getPlayingPlayers().size() > 0) { } else if (yourTeam.getPlayingPlayers().size() > 0) {
lines.add("&7" + yourTeam.getPlayerTeam().getChatColor() + yourTeam.getPlayerTeam().getSmallName() + "&7] &f" + yourTeam.getPlayingPlayers().size() + " &7(YOU)"); lines.add("&7[" + yourTeam.getPlayerTeam().getChatColor() + yourTeam.getPlayerTeam().getSmallName() + "&7] &f" + yourTeam.getPlayingPlayers().size() + " &7(YOU)");
} else { } else {
lines.add("&7" + yourTeam.getPlayerTeam().getChatColor() + yourTeam.getPlayerTeam().getSmallName() + "&7] &c&l✗ &7(You)"); lines.add("&7[" + yourTeam.getPlayerTeam().getChatColor() + yourTeam.getPlayerTeam().getSmallName() + "&7] &c&l✗ &7(You)");
} }
if (opposingTeam.isHasBed()) { if (opposingTeam.isHasBed()) {
lines.add("&7" + opposingTeam.getPlayerTeam().getChatColor() + opposingTeam.getPlayerTeam().getSmallName() + "&7] &a&l✓"); lines.add("&7[" + opposingTeam.getPlayerTeam().getChatColor() + opposingTeam.getPlayerTeam().getSmallName() + "&7] &a&l✓");
} else if (opposingTeam.getPlayingPlayers().size() > 0) { } else if (opposingTeam.getPlayingPlayers().size() > 0) {
lines.add("&7" + opposingTeam.getPlayerTeam().getChatColor() + opposingTeam.getPlayerTeam().getSmallName() + "&7] &f" + yourTeam.getPlayingPlayers().size()); lines.add("&7[" + opposingTeam.getPlayerTeam().getChatColor() + opposingTeam.getPlayerTeam().getSmallName() + "&7] &f" + yourTeam.getPlayingPlayers().size());
} else { } else {
lines.add("&7" + opposingTeam.getPlayerTeam().getChatColor() + opposingTeam.getPlayerTeam().getSmallName() + "&7] &c&l✗"); lines.add("&7[" + opposingTeam.getPlayerTeam().getChatColor() + opposingTeam.getPlayerTeam().getSmallName() + "&7] &c&l✗");
} }
lines.add(" "); lines.add(" ");
lines.add("&fKills: &d" + playerData.getGameKills()); lines.add("&fKills: &d" + playerData.getGameKills());