From aacf37aa565617f05d79dc04537fdb7596428059 Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Sun, 26 Apr 2015 20:43:37 +0200 Subject: [PATCH] Update to Spigot 1.8.3-R2 --- buildnumber.properties | 4 ++-- .../TotalFreedomMod/TFM_ServerInterface.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index 70d472a8..4386d4a8 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon Feb 16 16:40:10 CET 2015 -build.number=982 +#Sun Apr 26 20:42:55 CEST 2015 +build.number=983 diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java index 3ef70126..c96b9158 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java @@ -5,8 +5,9 @@ import java.util.List; import java.util.UUID; import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; -import net.minecraft.server.v1_8_R1.MinecraftServer; -import net.minecraft.server.v1_8_R1.PropertyManager; +import net.minecraft.server.v1_8_R2.EntityPlayer; +import net.minecraft.server.v1_8_R2.MinecraftServer; +import net.minecraft.server.v1_8_R2.PropertyManager; import org.bukkit.ChatColor; import org.bukkit.Server; import org.bukkit.entity.Player; @@ -29,9 +30,8 @@ public class TFM_ServerInterface { String[] whitelisted = MinecraftServer.getServer().getPlayerList().getWhitelisted(); int size = whitelisted.length; - for (String player : MinecraftServer.getServer().getPlayerList().getWhitelist().getEntries()) - { - MinecraftServer.getServer().getPlayerList().getWhitelist().remove(player); + for (EntityPlayer player : MinecraftServer.getServer().getPlayerList().players) { + MinecraftServer.getServer().getPlayerList().getWhitelist().remove(player.getProfile()); } try @@ -48,7 +48,7 @@ public class TFM_ServerInterface public static boolean isWhitelisted() { - return MinecraftServer.getServer().getPlayerList().hasWhitelist; + return MinecraftServer.getServer().getPlayerList().getHasWhitelist(); } public static List getWhitelisted()