Fix & Enhance Whitelist

src/main/java/ch/njol/skript/conditions/CondIsWhitelisted.java

@@ -19,72 +19,72 @@
 package ch.njol.skript.conditions;
 
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
 
 @Name("Is Whitelisted")
-@Description("Whether or not the server or a player is whitelisted.")
-@Examples({"if server is whitelisted:", "if player is whitelisted"})
-@Since("2.5.2")
+@Description("Whether or not the server or a player is whitelisted, and server is whitelist enforced.")
+@Examples({
+	"if player is whitelisted:",
+	"if server is whitelisted:",
+	"if server is whitelist enforced:"
+})
+@Since("2.5.2, INSERT VERSION (enforce)")
+@RequiredPlugins("Minecraft 1.17+")
 public class CondIsWhitelisted extends Condition {
-
+
+	private static final boolean ENFORCE_SUPPORT;
+
 	static {
+		ENFORCE_SUPPORT = Skript.methodExists(Bukkit.class, "isWhitelistEnforced");
 		Skript.registerCondition(CondIsWhitelisted.class,
 			"[the] server (is|1¦is(n't| not)) white[ ]listed",
-			"%players% (is|are)(|1¦(n't| not)) white[ ]listed");
+			"%offlineplayers% (is|are)(|1¦(n't| not)) white[ ]listed",
+			(ENFORCE_SUPPORT ? "[the] server (is|1¦is(n't| not)) white[ ]list enforced" : ""));
 	}
-	
+
 	@Nullable
-	private Expression<Player> player;
-	
+	private Expression<OfflinePlayer> player;
+
 	private boolean isServer;
-
+	private boolean isEnforce;
+
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		setNegated(parseResult.mark == 1);
-		isServer = matchedPattern == 0;
-		if (matchedPattern == 1)
-			player = (Expression<Player>) exprs[0];
+		if (matchedPattern == 0 || matchedPattern == 2) {
+			isServer = true;
+			isEnforce = matchedPattern == 2;
+		}
+		else if (matchedPattern == 1)
+			player = (Expression<OfflinePlayer>) exprs[0];
 		return true;
 	}
-	
+
 	@Override
-	@SuppressWarnings("null")
-	public boolean check(Event e) {
+	public boolean check(Event event) {
 		if (isServer)
-			return Bukkit.hasWhitelist() == isNegated();
-		Player[] players = player.getAll(e);
-		if (player.getAnd() && isNegated()) {
-			for (Player player : players)
-				if (player.isWhitelisted())
-					return false;
-		} else if(player.getAnd()){
-			for (Player player : players)
-				if (!player.isWhitelisted())
-					return false;
-		} else {
-			for (Player player: players)
-				if(player.isWhitelisted())
-					return !isNegated();
-		}
-		return !isNegated();
+			return (isEnforce ? Bukkit.isWhitelistEnforced() : Bukkit.hasWhitelist()) ^ isNegated();
+
+		return player.check(event, OfflinePlayer::isWhitelisted, isNegated());
 	}
-	
+
 	@Override
-	@SuppressWarnings("null")
-	public String toString(@Nullable Event e, boolean debug) {
-		return (player.getSingle(e) != null ? "player" : "server") + (isNegated() ? "not" : "") + "  whitelisted";
+	public String toString(@Nullable Event event, boolean debug) {
+		return (isServer ? "server" : "player") + " is " + (isNegated() ? "not" : "") + " "
+			+ (isEnforce ? "whitelist enforced" : "whitelisted");
 	}
-	
+
 }

src/main/java/ch/njol/skript/expressions/ExprWhitelist.java

@@ -21,6 +21,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -29,6 +30,7 @@
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
@@ -38,83 +40,112 @@
 import ch.njol.util.coll.CollectionUtils;
 
 @Name("Whitelist")
-@Description("A server's whitelist." +
-	"This expression can be used to add/remove players to/from the whitelist," +
-	" to enable it and disable it (set whitelist to true / set whitelist to false)," +
-	" and to empty it (reset whitelist)")
+@Description({
+	"A server's whitelist or whitelist enforcement.",
+	"This expression can be used to add/remove players to/from the whitelist.",
+	"To enable and disable it (set whitelist to true / set whitelist to false), and to empty it (reset whitelist)",
+	"To enable and disable enforcement (set whitelist enforcement to true / set whitelist enforcement to false),",
+	"which kicks all non-whitelisted players once set to true."
+})
 @Examples({"set whitelist to false",
 	"add all players to whitelist",
 	"reset the whitelist"})
-@Since("2.5.2")
+@Since("2.5.2, INSERT VERSION (enforce)")
+@RequiredPlugins("Minecraft 1.17+")
 public class ExprWhitelist extends SimpleExpression<OfflinePlayer> {
-
+
+	private static final boolean ENFORCE_SUPPORT;
+
 	static {
-		Skript.registerExpression(ExprWhitelist.class, OfflinePlayer.class, ExpressionType.SIMPLE, "[the] white[ ]list");
+		ENFORCE_SUPPORT = Skript.methodExists(Bukkit.class, "setWhitelistEnforced", boolean.class);
+		Skript.registerExpression(ExprWhitelist.class, OfflinePlayer.class, ExpressionType.SIMPLE, "[the] white[ ]list"
+			+ (ENFORCE_SUPPORT ? " [:enforcement]" : ""));
 	}
-
+
+	private boolean isEnforce;
+
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		isEnforce = parseResult.hasTag("enforcement");
 		return true;
 	}
-
-	@Nullable
+
 	@Override
-	protected OfflinePlayer[] get(Event e) {
-		return Bukkit.getServer().getWhitelistedPlayers().toArray(new OfflinePlayer[0]);
+	protected OfflinePlayer[] get(Event event) {
+		return (!isEnforce ? Bukkit.getServer().getWhitelistedPlayers().toArray(new OfflinePlayer[0]) : new OfflinePlayer[0]);
 	}
-
-	@Nullable
+
 	@Override
 	public Class<?>[] acceptChange(ChangeMode mode) {
-		if (mode == ChangeMode.ADD || mode == ChangeMode.REMOVE)
+		if (mode == ChangeMode.ADD || mode == ChangeMode.REMOVE) {
+			if (isEnforce) {
+				if (ENFORCE_SUPPORT)
+					Skript.error("\"Whitelist enforcement\" can't have anything " + (mode == ChangeMode.ADD ? "added" : "removed") + "." +
+						" Use 'whitelist' instead.");
+				return null;
+			}
 			return CollectionUtils.array(OfflinePlayer[].class);
-		else if (mode == ChangeMode.SET || mode == ChangeMode.RESET)
+		} else if (mode == ChangeMode.SET || mode == ChangeMode.RESET) {
+			if (mode == ChangeMode.RESET && isEnforce)
+				return null;
 			return CollectionUtils.array(Boolean.class);
-		else
-			return null;
+		}
+		return null;
 	}
-	
+
 	@Override
-	public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {
+	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		switch (mode) {
 			case SET:
-				if (delta != null)
-					Bukkit.setWhitelist((Boolean) delta[0]);
+				boolean value = (boolean) delta[0];
+				if (isEnforce)
+					Bukkit.setWhitelistEnforced(value);
+				else
+					Bukkit.setWhitelist(value);
+				if (ENFORCE_SUPPORT)
+					reloadWhitelist();
 				break;
 			case ADD:
-				if (delta != null) {
-					for (Object p : delta)
-						((OfflinePlayer) p).setWhitelisted(true);
-				}
+				for (Object p : delta)
+					((OfflinePlayer) p).setWhitelisted(true);
 				break;
 			case REMOVE:
-				if (delta != null) {
-					for (Object p : delta)
-						((OfflinePlayer) p).setWhitelisted(false);
-				}
+				for (Object p : delta)
+					((OfflinePlayer) p).setWhitelisted(false);
+				if (ENFORCE_SUPPORT)
+					reloadWhitelist();
 				break;
 			case RESET:
-				for (OfflinePlayer p : Bukkit.getWhitelistedPlayers())
+				for (OfflinePlayer p : Bukkit.getWhitelistedPlayers()) {
 					p.setWhitelisted(false);
+				}
 				break;
 			default:
 				assert false;
 		}
 	}
-
+
+	private void reloadWhitelist() {
+		Bukkit.reloadWhitelist();
+		for (Player player : Bukkit.getOnlinePlayers()) {
+			if (!player.isWhitelisted() && !player.isOp())
+				player.kickPlayer("You are not whitelisted on this server!");
+		}
+	}
+
 	@Override
 	public boolean isSingle() {
 		return false;
 	}
-	
+
 	@Override
 	public Class<? extends OfflinePlayer> getReturnType() {
 		return OfflinePlayer.class;
 	}
-	
+
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "whitelist";
+	public String toString(@Nullable Event event, boolean debug) {
+		return "whitelist" + (isEnforce ? " enforcement" : "");
 	}
-	
+
 }