2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-03-02 21:23:06 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
|
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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2020-07-22 23:35:44 +00:00
|
|
|
index bbace0cf80a7cc85a4e70a8cd760a932e33cc72c..5f9cbdcbaca06d0228411b75665054092334069a 100644
|
2019-03-02 21:23:06 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2020-06-28 22:44:34 +00:00
|
|
|
@@ -930,9 +930,9 @@ public abstract class PlayerList {
|
2019-03-02 21:23:06 +00:00
|
|
|
}
|
|
|
|
|
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) {
|
