GameJams/MinestomGameJam
1
0
Fork 0
Code Activity

Change ConnectionManager to Misc.getPlayer(uuid)

Browse source
This commit is contained in:
Andus 2024-08-11 02:11:14 +02:00
parent 9598f05674
commit 9b387efe7e
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/dev/cfox/gamejam/game/classes/GameLobby.java
View file

@ -1,6 +1,7 @@
package dev.cfox.gamejam.game.classes; package dev.cfox.gamejam.game.classes;
import dev.cfox.gamejam.game.managers.GameManager; import dev.cfox.gamejam.game.managers.GameManager;
import dev.cfox.gamejam.utils.Misc;
import dev.cfox.gamejam.utils.classes.Randomized; import dev.cfox.gamejam.utils.classes.Randomized;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.text.ComponentLike;
@ -17,7 +18,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Objects;
import java.util.UUID; import java.util.UUID;
public class GameLobby { public class GameLobby {
@ -33,7 +33,7 @@ public class GameLobby {
public void setPlayers(ArrayList<UUID> playerList) { public void setPlayers(ArrayList<UUID> playerList) {
players.addAll(playerList); players.addAll(playerList);
for (UUID uuid : players) { for (UUID uuid : players) {
team.addMember(MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(uuid).getUsername()); team.addMember(Misc.getPlayer(uuid).getUsername());
} }
team.updateCollisionRule(TeamsPacket.CollisionRule.NEVER); team.updateCollisionRule(TeamsPacket.CollisionRule.NEVER);
} }
@ -86,9 +86,9 @@ public class GameLobby {
public void setInstance(Instance instance, Pos pos) { public void setInstance(Instance instance, Pos pos) {
this.instance = instance; this.instance = instance;
players.forEach(player -> { players.forEach(uuid -> {
Objects.requireNonNull(MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(player)).setInstance(instance) Misc.getPlayer(uuid).setInstance(instance)
.thenRun(() -> Objects.requireNonNull(MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(player)).teleport(pos)); .thenRun(() -> Misc.getPlayer(uuid).teleport(pos));
}); });
} }
@ -97,12 +97,12 @@ public class GameLobby {
} }
public void teleport(Pos pos) { public void teleport(Pos pos) {
players.forEach(player -> { players.forEach(uuid -> {
Objects.requireNonNull(MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(player)).teleport(pos); Misc.getPlayer(uuid).teleport(pos);
}); });
} }
public void sendMessage(ComponentLike component) { public void sendMessage(ComponentLike component) {
players.forEach(player -> MinecraftServer.getConnectionManager().getOnlinePlayerByUuid(player).sendMessage(component)); players.forEach(uuid -> Misc.getPlayer(uuid).sendMessage(component));
} }
} }

2
src/main/java/dev/cfox/gamejam/utils/events/StartEvents.java
View file

@ -52,7 +52,7 @@ public class StartEvents {
if (event.isFirstSpawn()) { if (event.isFirstSpawn()) {
player.sendMessage(Component.text( 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)); Misc.showTitle(player.getInstance(), Component.text("■", NamedTextColor.RED), Component.text("Red", NamedTextColor.RED));
} }
}); });