summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvilSeph <evilseph@unaligned.org>2011-04-22 00:42:56 -0400
committerEvilSeph <evilseph@unaligned.org>2011-04-22 00:42:56 -0400
commit58d3107e4c60138c35a043cf63b9f3490f6bdf95 (patch)
tree9d481bdf039b22b676ec5faa8ad047df5dd0ba89
parentc18e04ce8b479f5b291b720c29894284ffe307fa (diff)
downloadcraftbukkit-58d3107e4c60138c35a043cf63b9f3490f6bdf95.tar
craftbukkit-58d3107e4c60138c35a043cf63b9f3490f6bdf95.tar.gz
craftbukkit-58d3107e4c60138c35a043cf63b9f3490f6bdf95.tar.lz
craftbukkit-58d3107e4c60138c35a043cf63b9f3490f6bdf95.tar.xz
craftbukkit-58d3107e4c60138c35a043cf63b9f3490f6bdf95.zip
Fixing CLI arguments for the 100th time - now with CraftBukkit comment-ey goodness.
-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 a7fed1fe..ce5df414 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -91,7 +91,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
}
log.info("Loading properties");
- this.propertyManager = new PropertyManager(new File("server.properties"));
+ this.propertyManager = new PropertyManager(options); // CraftBukkit - CLI argument support
String s = this.propertyManager.getString("server-ip", "");
this.onlineMode = this.propertyManager.getBoolean("online-mode", true);