diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/DedicatedServer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/DedicatedServer.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java index 3b0ec70b..92013756 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -47,7 +47,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true)); // CraftBukkit end - log.info("Starting minecraft server version 1.4.5"); + log.info("Starting minecraft server version 1.4.6"); if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); } @@ -101,6 +101,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer return false; } + this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit + if (!this.getOnlineMode()) { log.warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); log.warning("The server will make no attempt to authenticate usernames. Beware."); @@ -108,7 +110,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer log.warning("To change this, set \"online-mode\" to \"true\" in the server.properties file."); } - this.a((ServerConfigurationManagerAbstract) (new ServerConfigurationManager(this))); + // this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit - moved up this.convertable = new WorldLoaderServer(server.getWorldContainer()); // CraftBukkit - moved from MinecraftServer constructor long j = System.nanoTime(); @@ -264,8 +266,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer return true; } - public ServerConfigurationManager am() { - return (ServerConfigurationManager) super.getServerConfigurationManager(); + public DedicatedPlayerList am() { + return (DedicatedPlayerList) super.getPlayerList(); } public ServerConnection ae() { @@ -319,7 +321,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer return this.propertyManager.getInt("spawn-protection", super.getSpawnProtection()); } - public ServerConfigurationManagerAbstract getServerConfigurationManager() { + public PlayerList getPlayerList() { return this.am(); } } |