summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2014-04-12 07:21:01 -0500
committerTravis Watkins <amaranth@ubuntu.com>2014-04-12 07:21:01 -0500
commitf6a93775bf0bd6d6fd5ace0539565c55983bd795 (patch)
treee769e5970428f279576a575cbaf8f959ea26ff78
parent7b409ed4e91e3fec383372af8fb52f547d8490a9 (diff)
downloadcraftbukkit-f6a93775bf0bd6d6fd5ace0539565c55983bd795.tar
craftbukkit-f6a93775bf0bd6d6fd5ace0539565c55983bd795.tar.gz
craftbukkit-f6a93775bf0bd6d6fd5ace0539565c55983bd795.tar.lz
craftbukkit-f6a93775bf0bd6d6fd5ace0539565c55983bd795.tar.xz
craftbukkit-f6a93775bf0bd6d6fd5ace0539565c55983bd795.zip
Check the actual whitelist for Player#isWhitelisted()
The server's check is for whether or not a player can pass the whitelist not just if the player is on it. That seems like more useful information but the API has always just checked if they are on it so this commit restores that.
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b5a54c85..220967ba 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -752,7 +752,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public boolean isWhitelisted() {
- return server.getHandle().isWhitelisted(getProfile());
+ return server.getHandle().getWhitelist().isWhitelisted(getProfile());
}
@Override