Merge pull request #3804 from Janrupf/feature/default-server

Add ability to select a server to join in the instance settings

1 files changed, 17 insertions, 1 deletions

diff --git a/libraries/launcher/org/multimc/LegacyFrame.java b/libraries/launcher/org/multimc/LegacyFrame.java
index c72c053e..985a10e6 100644
--- a/libraries/launcher/org/multimc/LegacyFrame.java
+++ b/libraries/launcher/org/multimc/LegacyFrame.java
@@ -46,7 +46,16 @@ public class LegacyFrame extends Frame implements WindowListener
         this.addWindowListener ( this );
     }
 
-    public void start ( Applet mcApplet, String user, String session, int winSizeW, int winSizeH, boolean maximize )
+    public void start (
+        Applet mcApplet,
+        String user,
+        String session,
+        int winSizeW,
+        int winSizeH,
+        boolean maximize,
+        String serverAddress,
+        String serverPort
+    )
     {
         try {
             appletWrap = new Launcher( mcApplet, new URL ( "http://www.minecraft.net/game" ) );
@@ -95,6 +104,13 @@ public class LegacyFrame extends Frame implements WindowListener
             e.printStackTrace(System.err);
             System.exit(-1);
         }
+
+        if (serverAddress != null)
+        {
+            appletWrap.setParameter("server", serverAddress);
+            appletWrap.setParameter("port", serverPort);
+        }
+
         appletWrap.setParameter ( "username", user );
         appletWrap.setParameter ( "sessionid", session );
         appletWrap.setParameter ( "stand-alone", "true" ); // Show the quit button.