@@ -60,7 +60,6 @@ protected Stage[] setStages() {
60
60
Path natives = MCPPaths .get (mcp , NATIVES ).toAbsolutePath ();
61
61
62
62
List <String > args = new ArrayList <>();
63
- List <String > gameArgs = new ArrayList <>();
64
63
args .add (Util .getJava ());
65
64
String cpString = String .join (File .pathSeparator , classPath );
66
65
for (String s : getJvmArgs (mcp , mcpSide )) {
@@ -72,14 +71,14 @@ protected Stage[] setStages() {
72
71
Collections .addAll (args , runArgs );
73
72
args .add (main );
74
73
if (side == Side .CLIENT ) {
75
- gameArgs . addAll (getLaunchArgs (mcp , mcpSide ));
74
+ List < String > gameArgs = new ArrayList <> (getLaunchArgs (mcp , mcpSide ));
76
75
Collections .addAll (gameArgs , mcp .getOptions ().getStringParameter (TaskParameter .GAME_ARGS ).split (" " ));
77
76
args .addAll (gameArgs );
78
77
}
79
78
mcp .log ("Launch arguments: " + String .join (", " , args ));
80
79
// mcp.log("Classpath:\n" + String.join("\n", classPath));
81
80
82
- Util .runCommand (args .toArray (new String [0 ]), getMCDir (mcp , mcpSide ), true );
81
+ Util .runCommand (args .toArray (new String [0 ]), MCPPaths . get (mcp , GAMEDIR , side ), true );
83
82
})
84
83
};
85
84
}
0 commit comments