1 files changed, 36 insertions, 0 deletions
diff --git a/Spigot-Server-Patches-Unmapped/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches-Unmapped/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
new file mode 100644
index 0000000000..922aab5b43
--- /dev/null
+++ b/Spigot-Server-Patches-Unmapped/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Sat, 2 Mar 2019 16:12:35 -0500
+Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency
+
+mojang stored whitelist state in 2 places (Whitelist Object, PlayerList)
+
+some things checked PlayerList, some checked object. This moves
+everything to the Whitelist object.
+
+https://github.com/PaperMC/Paper/issues/1880
+
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index 3ef632928bf93a8af5eccada3b1cc76354ed5617..317c921eaf734e890706f962b29233e3306a13be 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -55,6 +55,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutViewDistance;
+ import net.minecraft.network.protocol.game.PacketPlayOutWorldBorder;
+ import net.minecraft.resources.ResourceKey;
+ import net.minecraft.server.AdvancementDataPlayer;
++import net.minecraft.server.MCUtil;
+ import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.ScoreboardServer;
+ import net.minecraft.server.level.DemoPlayerInteractManager;
+@@ -1016,9 +1017,9 @@ public abstract class PlayerList {
+     }
+     public boolean isWhitelisted(GameProfile gameprofile, org.bukkit.event.player.PlayerLoginEvent loginEvent) {
+         boolean isOp = this.operators.d(gameprofile);
+-        boolean isWhitelisted = !this.hasWhitelist || isOp || this.whitelist.d(gameprofile);
++        boolean isWhitelisted = !this.getHasWhitelist() || isOp || this.whitelist.d(gameprofile);
+         final com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent event;
+-        event = new com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent(MCUtil.toBukkit(gameprofile), this.hasWhitelist, isWhitelisted, isOp, org.spigotmc.SpigotConfig.whitelistMessage);
++        event = new com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent(MCUtil.toBukkit(gameprofile), this.getHasWhitelist(), isWhitelisted, isOp, org.spigotmc.SpigotConfig.whitelistMessage);
+         event.callEvent();
+         if (!event.isWhitelisted()) {
+             if (loginEvent != null) {