summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-01-20 00:41:35 +0000
committerDinnerbone <dinnerbone@dinnerbone.com>2011-01-20 00:41:35 +0000
commitbded4fb316868e674f66c35b66e66b19c6dd0e90 (patch)
tree23973b5f1e03755b67f3f9ef28149f6a8216f272 /src/main/java/net
parent46e1b54a7457059fa3b9b421d6076fd554032314 (diff)
downloadcraftbukkit-bded4fb316868e674f66c35b66e66b19c6dd0e90.tar
craftbukkit-bded4fb316868e674f66c35b66e66b19c6dd0e90.tar.gz
craftbukkit-bded4fb316868e674f66c35b66e66b19c6dd0e90.tar.lz
craftbukkit-bded4fb316868e674f66c35b66e66b19c6dd0e90.tar.xz
craftbukkit-bded4fb316868e674f66c35b66e66b19c6dd0e90.zip
Fixed CLI arguments
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0d8a1bd0..01169d6d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -67,7 +67,7 @@ public class MinecraftServer implements ICommandListener, Runnable {
a.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
}
a.info("Loading properties");
- d = new PropertyManager(new File("server.properties"));
+ d = new PropertyManager(options);
String s = d.a("server-ip", "");
l = d.a("online-mode", true);