Fix for newest BungeeCord builds (after 4040d9f). Also fixes some minor stuff.

This commit is contained in:
Tux 2013-11-01 22:08:48 -04:00
parent b994839e3e
commit c4ee103700
1 changed files with 2 additions and 7 deletions

View File

@ -37,10 +37,6 @@ public class RedisBungee extends Plugin implements Listener {
private static RedisBungee plugin; private static RedisBungee plugin;
private boolean canonicalGlist = true; private boolean canonicalGlist = true;
protected JedisPool getPool() {
return pool;
}
protected String getServerId() { protected String getServerId() {
return serverId; return serverId;
} }
@ -247,7 +243,7 @@ public class RedisBungee extends Plugin implements Listener {
Map rawYaml; Map rawYaml;
try (InputStream in = new FileInputStream(file)) { try (InputStream in = new FileInputStream(file)) {
rawYaml = (Map) yaml.load(new FileInputStream(file)); rawYaml = (Map) yaml.load(in);
} }
String redisServer = "localhost"; String redisServer = "localhost";
@ -339,8 +335,7 @@ public class RedisBungee extends Plugin implements Listener {
players.add(new ServerPing.PlayerInfo(player, "aaaa")); players.add(new ServerPing.PlayerInfo(player, "aaaa"));
} }
ServerPing reply = new ServerPing(); ServerPing reply = new ServerPing();
reply.setPlayers(new ServerPing.Players(old.getPlayers().getMax(), players.size())); reply.setPlayers(new ServerPing.Players(old.getPlayers().getMax(), players.size(), players.toArray(new ServerPing.PlayerInfo[players.size()])));
reply.setSample(players.toArray(new ServerPing.PlayerInfo[players.size()]));
reply.setDescription(old.getDescription()); reply.setDescription(old.getDescription());
reply.setFavicon(old.getFavicon()); reply.setFavicon(old.getFavicon());
reply.setVersion(old.getVersion()); reply.setVersion(old.getVersion());