allow magarena.dir to take precedence over user.dir for determining GAME_PATH
parent
97e5ceb178
commit
474115fb83
|
@ -18,7 +18,12 @@ public class MagicMain {
|
||||||
private static final String GAME_FOLDER = "Magarena";
|
private static final String GAME_FOLDER = "Magarena";
|
||||||
private static final String MODS_PATH = "mods";
|
private static final String MODS_PATH = "mods";
|
||||||
private static final String SCRIPTS_PATH = "scripts";
|
private static final String SCRIPTS_PATH = "scripts";
|
||||||
private static final String GAME_PATH = System.getProperty("user.dir")+File.separatorChar+GAME_FOLDER;
|
private static final String GAME_PATH =
|
||||||
|
(System.getProperty("magarena.dir") != null ?
|
||||||
|
System.getProperty("magarena.dir") :
|
||||||
|
System.getProperty("user.dir")) +
|
||||||
|
File.separatorChar +
|
||||||
|
GAME_FOLDER;
|
||||||
|
|
||||||
public static void main(final String args[]) {
|
public static void main(final String args[]) {
|
||||||
// setup the handler for any uncaught exception
|
// setup the handler for any uncaught exception
|
||||||
|
|
Loading…
Reference in New Issue