2 files changed, 8 insertions, 6 deletions
diff --git a/libraries/launcher/org/polymc/applet/LegacyFrame.java b/libraries/launcher/org/polymc/applet/LegacyFrame.java
index 2cdd17d7..7ae56e60 100644
--- a/libraries/launcher/org/polymc/applet/LegacyFrame.java
+++ b/libraries/launcher/org/polymc/applet/LegacyFrame.java
@@ -63,7 +63,8 @@ public final class LegacyFrame extends Frame {
         int winSizeH,
         boolean maximize,
         String serverAddress,
-        String serverPort
+        String serverPort,
+        boolean isDemo
     ) {
         // Implements support for launching in to multiplayer on classic servers using a mpticket
         // file generated by an external program and stored in the instance's root folder.
@@ -106,7 +107,7 @@ public final class LegacyFrame extends Frame {
         appletWrap.setParameter("sessionid", session);
         appletWrap.setParameter("stand-alone", "true"); // Show the quit button.
         appletWrap.setParameter("haspaid", "true"); // Some old versions need this for world saves to work.
-        appletWrap.setParameter("demo", "false");
+        appletWrap.setParameter("demo", isDemo ? "true" : "false");
         appletWrap.setParameter("fullscreen", "false");
 
         add(appletWrap);
diff --git a/libraries/launcher/org/polymc/impl/OneSixLauncher.java b/libraries/launcher/org/polymc/impl/OneSixLauncher.java
index 362ff8d6..d43101eb 100644
--- a/libraries/launcher/org/polymc/impl/OneSixLauncher.java
+++ b/libraries/launcher/org/polymc/impl/OneSixLauncher.java
@@ -24,8 +24,8 @@ import java.applet.Applet;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.Collections;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -58,10 +58,10 @@ public final class OneSixLauncher implements Launcher {
     public OneSixLauncher(Parameters params) {
         classLoader = ClassLoader.getSystemClassLoader();
 
-        mcParams = params.allSafe("param", Collections.<String>emptyList());
+        mcParams = params.allSafe("param", new ArrayList<String>());
         mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
         appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
-        traits = params.allSafe("traits", Collections.<String>emptyList());
+        traits = params.allSafe("traits", new ArrayList<String>());
 
         userName = params.first("userName");
         sessionId = params.first("sessionId");
@@ -137,7 +137,8 @@ public final class OneSixLauncher implements Launcher {
                         winSizeH,
                         maximize,
                         serverAddress,
-                        serverPort
+                        serverPort,
+                        mcParams.contains("--demo")
                 );
 
                 return;