diff --git a/src/main/java/dev/cfox/gamejam/game/classes/GameLobby.java b/src/main/java/dev/cfox/gamejam/game/classes/GameLobby.java index 0d145ec..e3dcc6b 100644 --- a/src/main/java/dev/cfox/gamejam/game/classes/GameLobby.java +++ b/src/main/java/dev/cfox/gamejam/game/classes/GameLobby.java @@ -1,6 +1,7 @@ package dev.cfox.gamejam.game.classes; import dev.cfox.gamejam.game.managers.GameManager; +import dev.cfox.gamejam.utils.Misc; import dev.cfox.gamejam.utils.classes.Randomized; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ComponentLike; @@ -17,7 +18,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.ArrayList; -import java.util.Objects; import java.util.UUID; public class GameLobby { @@ -33,7 +33,7 @@ public class GameLobby { public void setPlayers(ArrayList playerList) { players.addAll(playerList); for (UUID uuid : players) { - team.addMember(MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(uuid).getUsername()); + team.addMember(Misc.getPlayer(uuid).getUsername()); } team.updateCollisionRule(TeamsPacket.CollisionRule.NEVER); } @@ -86,9 +86,9 @@ public class GameLobby { public void setInstance(Instance instance, Pos pos) { this.instance = instance; - players.forEach(player -> { - Objects.requireNonNull(MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(player)).setInstance(instance) - .thenRun(() -> Objects.requireNonNull(MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(player)).teleport(pos)); + players.forEach(uuid -> { + Misc.getPlayer(uuid).setInstance(instance) + .thenRun(() -> Misc.getPlayer(uuid).teleport(pos)); }); } @@ -97,12 +97,12 @@ public class GameLobby { } public void teleport(Pos pos) { - players.forEach(player -> { - Objects.requireNonNull(MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(player)).teleport(pos); + players.forEach(uuid -> { + Misc.getPlayer(uuid).teleport(pos); }); } public void sendMessage(ComponentLike component) { - players.forEach(player -> MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(player).sendMessage(component)); + players.forEach(uuid -> Misc.getPlayer(uuid).sendMessage(component)); } } diff --git a/src/main/java/dev/cfox/gamejam/utils/events/StartEvents.java b/src/main/java/dev/cfox/gamejam/utils/events/StartEvents.java index 4a79c54..5674062 100644 --- a/src/main/java/dev/cfox/gamejam/utils/events/StartEvents.java +++ b/src/main/java/dev/cfox/gamejam/utils/events/StartEvents.java @@ -52,7 +52,7 @@ public class StartEvents { if (event.isFirstSpawn()) { player.sendMessage(Component.text( - "§e§lClick on §ror §e§lrun into §rthe Minestom NPC to §a§ljoin the queue!", NamedTextColor.GRAY)); + "§eClick on §ror §erun into §rthe Minestom NPC to §ajoin the queue!", NamedTextColor.GRAY)); Misc.showTitle(player.getInstance(), Component.text("■", NamedTextColor.RED), Component.text("Red", NamedTextColor.RED)); } });