summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-02-19 19:45:22 +0000
committerDinnerbone <dinnerbone@dinnerbone.com>2011-02-19 19:45:22 +0000
commita6b3965672d4d25007571b63b718ef791f128894 (patch)
tree9b0f339a5977cb6d7d801e612c2599b69a302073 /src/main
parentb160913c436ad92f81e87cb08ea878b34a41421d (diff)
downloadcraftbukkit-a6b3965672d4d25007571b63b718ef791f128894.tar
craftbukkit-a6b3965672d4d25007571b63b718ef791f128894.tar.gz
craftbukkit-a6b3965672d4d25007571b63b718ef791f128894.tar.lz
craftbukkit-a6b3965672d4d25007571b63b718ef791f128894.tar.xz
craftbukkit-a6b3965672d4d25007571b63b718ef791f128894.zip
Fixed CLI arguments
Diffstat (limited to 'src/main')
-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 6d800657..7cbbbefc 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -68,7 +68,7 @@ public class MinecraftServer implements ICommandListener, Runnable {
}
a.info("Loading properties");
- this.d = new PropertyManager(new File("server.properties"));
+ this.d = new PropertyManager(options); // Craftbukkit
String s = this.d.a("server-ip", "");
this.l = this.d.a("online-mode", true);