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

e

Browse Source
This commit is contained in:
Luca 2021-11-22 17:09:33 +01:00
parent 86413e60a0
commit bf339a4b07
2 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,42 +82,37 @@ public class QueueManager {
Player opponentPlayer = Bukkit.getPlayer(opponent); Player opponentPlayer = Bukkit.getPlayer(opponent);
List<UUID> playersA = new ArrayList<>(); GameTeam teamA = new GameTeam(player.getUniqueId(), Collections.singletonList(player.getUniqueId()), 0, PlayerTeam.RED);
List<UUID> playersB = new ArrayList<>(); GameTeam teamB = new GameTeam(player.getUniqueId(), Collections.singletonList(opponentPlayer.getUniqueId()), 1, PlayerTeam.LIME);
playersA.add(player.getUniqueId());
playersB.add(opponent);
GameTeam teamA = new GameTeam(player.getUniqueId(), playersA, 0, PlayerTeam.RED);
GameTeam teamB = new GameTeam(player.getUniqueId(), playersB, 1, PlayerTeam.LIME);
Arena arena = this.plugin.getArenaManager().getRandomArena(); Arena arena = this.plugin.getArenaManager().getRandomArena();
if (this.getQueueSizeByType(gameType) >= gameType.getQueueAmount()) { player.sendMessage(" ");
player.sendMessage(CC.translate("&aGame found!"));
player.sendMessage(CC.translate("&7⚫ &fOpponent: &d" + opponentPlayer.getName()));
player.sendMessage(CC.translate("&7⚫ &fArena: &d" + arena.getName()));
player.sendMessage(CC.translate("&7⚫ &fGame: &d" + gameType.getName()));
player.sendMessage(" ");
player.sendMessage(" "); opponentPlayer.sendMessage(" ");
player.sendMessage(CC.translate("&aGame found!")); opponentPlayer.sendMessage(CC.translate("&aGame found!"));
player.sendMessage(CC.translate("&7⚫ &fOpponent: &d" + opponentPlayer.getName())); opponentPlayer.sendMessage(CC.translate("&7⚫ &fOpponent: &d" + player.getName()));
player.sendMessage(CC.translate("&7⚫ &fArena: &d" + arena.getName())); opponentPlayer.sendMessage(CC.translate("&7⚫ &fArena: &d" + arena.getName()));
player.sendMessage(CC.translate("&7⚫ &fGame: &d" + gameType.getName())); opponentPlayer.sendMessage(CC.translate("&7⚫ &fGame: &d" + gameType.getName()));
player.sendMessage(" "); opponentPlayer.sendMessage(" ");
opponentPlayer.sendMessage(" "); Game game = new Game(arena, gameType, teamA, teamB);
opponentPlayer.sendMessage(CC.translate("&aGame found!")); this.plugin.getGameManager().createGame(game);
opponentPlayer.sendMessage(CC.translate("&7⚫ &fOpponent: &d" + player.getName()));
opponentPlayer.sendMessage(CC.translate("&7⚫ &fArena: &d" + arena.getName()));
opponentPlayer.sendMessage(CC.translate("&7⚫ &fGame: &d" + gameType.getName()));
opponentPlayer.sendMessage(" ");
Game game = new Game(arena, gameType, teamA, teamB); this.queued.remove(player.getUniqueId());
this.plugin.getGameManager().createGame(game); this.queued.remove(opponentPlayer.getUniqueId());
this.queued.remove(player.getUniqueId()); this.queueTime.remove(player.getUniqueId());
this.queued.remove(opponentPlayer.getUniqueId()); this.queueTime.remove(opponentPlayer.getUniqueId());
this.queueTime.remove(player.getUniqueId()); // if (this.getQueueSizeByType(gameType) >= gameType.getQueueAmount()) {
this.queueTime.remove(opponentPlayer.getUniqueId()); //
} // }
} }
} }

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

@ -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("&f7" + 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("&f7" + 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("&f7" + 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("&f7" + 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("&f7" + 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("&f7" + 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());