From 45320492d695b0f039e641940de2ddd1807109b8 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:26:28 -0700
Subject: [PATCH] Fix wrong data urls being set in QueryGateway

---
 src/main/java/emu/lunarcore/Config.java       |  1 +
 .../java/emu/lunarcore/GameConstants.java     |  1 -
 .../http/handlers/QueryGatewayHandler.java    | 21 ++++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/emu/lunarcore/Config.java b/src/main/java/emu/lunarcore/Config.java
index 5415cfd..faa96e2 100644
--- a/src/main/java/emu/lunarcore/Config.java
+++ b/src/main/java/emu/lunarcore/Config.java
@@ -96,6 +96,7 @@ public class Config {
     
     @Getter
     public static class DownloadData {
+        public String mdkVersion = null;
         public String assetBundleUrl = null;
         public String exResourceUrl = null;
         public String luaUrl = null;
diff --git a/src/main/java/emu/lunarcore/GameConstants.java b/src/main/java/emu/lunarcore/GameConstants.java
index aea6bc9..3a05097 100644
--- a/src/main/java/emu/lunarcore/GameConstants.java
+++ b/src/main/java/emu/lunarcore/GameConstants.java
@@ -7,7 +7,6 @@ import emu.lunarcore.util.Position;
 
 public class GameConstants {
     public static String VERSION = "1.4.0";
-    public static String MDK_VERSION = "";
     
     public static final ZoneOffset CURRENT_ZONEOFFSET = ZoneOffset.systemDefault().getRules().getOffset(Instant.now());
     public static final int CURRENT_TIMEZONE = CURRENT_ZONEOFFSET.getTotalSeconds() / 3600;
diff --git a/src/main/java/emu/lunarcore/server/http/handlers/QueryGatewayHandler.java b/src/main/java/emu/lunarcore/server/http/handlers/QueryGatewayHandler.java
index f38d22c..8b4f132 100644
--- a/src/main/java/emu/lunarcore/server/http/handlers/QueryGatewayHandler.java
+++ b/src/main/java/emu/lunarcore/server/http/handlers/QueryGatewayHandler.java
@@ -2,7 +2,6 @@ package emu.lunarcore.server.http.handlers;
 
 import org.jetbrains.annotations.NotNull;
 
-import emu.lunarcore.GameConstants;
 import emu.lunarcore.LunarCore;
 import emu.lunarcore.proto.GateserverOuterClass.Gateserver;
 import emu.lunarcore.util.Utils;
@@ -17,6 +16,9 @@ public class QueryGatewayHandler implements Handler {
 
     @Override
     public void handle(@NotNull Context ctx) throws Exception {
+        // Get streaming data from config
+        var data = LunarCore.getConfig().getDownloadData();
+        
         // Build gateserver proto
         Gateserver gateserver = Gateserver.newInstance()
                 .setRegionName(LunarCore.getConfig().getGameServer().getId())
@@ -24,23 +26,26 @@ public class QueryGatewayHandler implements Handler {
                 .setPort(LunarCore.getConfig().getGameServer().getPort())
                 .setUnk1(true)
                 .setUnk2(true)
-                .setUnk3(true)
-                .setMdkResVersion(GameConstants.MDK_VERSION);
+                .setUnk3(true);
         
-        // Set streaming data urls
-        var data = LunarCore.getConfig().getDownloadData();
+        // Set streaming data
+        if (data.mdkVersion != null) {
+            gateserver.setMdkResVersion(data.mdkVersion);
+        } else {
+            gateserver.setMdkResVersion("");
+        }
         
         if (data.assetBundleUrl != null) {
             gateserver.setAssetBundleUrl(data.assetBundleUrl);
         }
         if (data.exResourceUrl != null) {
-            gateserver.setAssetBundleUrl(data.exResourceUrl);
+            gateserver.setExResourceUrl(data.exResourceUrl);
         }
         if (data.luaUrl != null) {
-            gateserver.setAssetBundleUrl(data.luaUrl);
+            gateserver.setLuaUrl(data.luaUrl);
         }
         if (data.ifixUrl != null) {
-            gateserver.setAssetBundleUrl(data.ifixUrl);
+            gateserver.setIfixUrl(data.ifixUrl);
         }
 
         // Log