fix: proper gameId usage

Author: ArikSquad

commons/src/main/java/net/swofty/commons/protocol/objects/orchestrator/ChooseGameProtocolObject.java

@@ -27,7 +27,7 @@ public String serialize(ChooseGameMessage value) {
             public ChooseGameMessage deserialize(String json) {
                 JSONObject obj = new JSONObject(json);
                 return new ChooseGameMessage(
-                        UUID.fromString(obj.getString("player")),
+                        UUID.fromString(obj.getString("uuid")),
                         UnderstandableProxyServer.singleFromJSON(obj.getJSONObject("server")),
                         obj.getString("gameId")
                 );

service.generic/src/main/java/net/swofty/service/generic/redis/ServiceToServerManager.java

@@ -206,7 +206,7 @@ public static CompletableFuture<Map<UUID, JSONObject>> kickFromGUI(List<UUID> se
 
     public static CompletableFuture<Map<UUID, JSONObject>> gameInformation(UUID serverUUID, UUID playerUUID, String gameId) {
         JSONObject message = new JSONObject()
-                .put("playerUUID", playerUUID)
+                .put("uuid", playerUUID)
                 .put("game-id", gameId);
 
         return sendToServers(List.of(serverUUID), FromServiceChannels.GAME_INFORMATION, message);

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/Game.java

@@ -23,11 +23,8 @@
 import net.swofty.type.bedwarsgame.user.BedWarsPlayer;
 import net.swofty.type.bedwarsgame.user.ExperienceCause;
 import net.swofty.commons.BedwarsGameType;
-import net.swofty.type.bedwarsgeneric.data.BedWarsDataHandler;
 import net.swofty.type.bedwarsgeneric.game.MapsConfig;
-import net.swofty.type.generic.data.datapoints.DatapointMapStringLong;
 import net.swofty.type.generic.user.HypixelPlayer;
-import net.swofty.type.generic.utility.MathUtility;
 import org.tinylog.Logger;
 
 import java.util.*;
@@ -95,12 +92,12 @@ public void join(BedWarsPlayer player) {
 			countdown.startCountdown();
 		}
 
-		BedWarsDataHandler data = BedWarsDataHandler.getUser(player);
+		/*BedWarsDataHandler data = BedWarsDataHandler.getUser(player);
 		if (data != null) {
 			var counts = data.get(BedWarsDataHandler.Data.MAP_JOIN_COUNTS, DatapointMapStringLong.class).getValue();
 			counts.put(mapEntry.getId(), counts.getOrDefault(mapEntry.getId(), 0L) + 1);
 			data.get(BedWarsDataHandler.Data.MAP_JOIN_COUNTS, DatapointMapStringLong.class).setValue(counts);
-		}
+		}*/
 	}
 
 	/**

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/OrchestratorConnector.java

@@ -5,7 +5,6 @@
 import net.swofty.commons.ServiceType;
 import net.swofty.commons.UnderstandableProxyServer;
 import net.swofty.commons.protocol.objects.orchestrator.ChooseGameProtocolObject;
-import net.swofty.commons.protocol.objects.orchestrator.GetMapsProtocolObject;
 import net.swofty.commons.protocol.objects.orchestrator.GetServerForMapProtocolObject;
 import net.swofty.proxyapi.ProxyService;
 import net.swofty.type.generic.user.HypixelPlayer;
@@ -64,7 +63,7 @@ public void sendToGame(BedwarsGameType gameType, @Nullable String map) {
         findGameServer(gameType, map).thenAccept(pair -> {
             if (pair.first != null) {
                 ChooseGameProtocolObject.ChooseGameMessage message =
-                        new ChooseGameProtocolObject.ChooseGameMessage(player.getUuid(), pair.first, gameType.toString());
+                        new ChooseGameProtocolObject.ChooseGameMessage(player.getUuid(), pair.first, pair.second);
 
                 PROXY_SERVICE.handleRequest(message)
                         .exceptionally(throwable -> {

type.generic/src/main/java/net/swofty/type/generic/redis/service/RedisGameMessage.java

@@ -19,9 +19,9 @@ public FromServiceChannels getChannel() {
 	@Override
 	public JSONObject onMessage(JSONObject message) {
 		UUID uuid = UUID.fromString(message.getString("uuid"));
-		String originType = message.getString("game-id");
+		String gameId = message.getString("game-id");
 
-		game.put(uuid, originType);
+		game.put(uuid, gameId);
 		return new JSONObject();
 	}
 }