Fixed NPE on Player related methods in CraftServer

By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot 2011-01-03 19:41:23 +00:00
parent 9b1f8245df
commit 449fb6523a

View file

@ -15,17 +15,15 @@ import org.bukkit.plugin.java.JavaPluginLoader;
public final class CraftServer implements Server { public final class CraftServer implements Server {
private final String serverName = "Craftbukkit"; private final String serverName = "Craftbukkit";
private final String serverVersion; private final String serverVersion = "1.1";
private final PluginManager pluginManager = new SimplePluginManager(this); private final PluginManager pluginManager = new SimplePluginManager(this);
protected final MinecraftServer console; protected final MinecraftServer console;
protected final ServerConfigurationManager server; protected final ServerConfigurationManager server;
public CraftServer(MinecraftServer instance, String ver) { public CraftServer(MinecraftServer console, ServerConfigurationManager server) {
serverVersion = ver; this.console = console;
this.server = server;
console = instance;
server = console.f;
pluginManager.RegisterInterface(JavaPluginLoader.class); pluginManager.RegisterInterface(JavaPluginLoader.class);
@ -55,7 +53,7 @@ public final class CraftServer implements Server {
} }
public Player[] getOnlinePlayers() { public Player[] getOnlinePlayers() {
List<EntityPlayerMP> online = server.b; List<EntityPlayerMP> online = server.b;
Player[] players = new Player[online.size()]; Player[] players = new Player[online.size()];
for (int i = 0; i < players.length; i++) { for (int i = 0; i < players.length; i++) {