2019-05-27 06:14:14 +00:00
|
|
|
From bd800599343bcabf709745330c1dfcd9bf243dcf 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/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
|
2019-05-14 21:54:32 +00:00
|
|
|
index c169d01762..55bc4b265d 100644
|
2019-03-02 21:23:06 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/JsonList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/JsonList.java
|
|
|
|
@@ -64,6 +64,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {
|
|
|
|
return this.e;
|
|
|
|
}
|
|
|
|
|
2019-05-05 17:19:34 +00:00
|
|
|
+ public void setEnabled(boolean flag) { this.a(flag); } // Paper - OBFHeLPER
|
2019-03-02 21:23:06 +00:00
|
|
|
public void a(boolean flag) {
|
|
|
|
this.e = flag;
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2019-05-14 21:54:32 +00:00
|
|
|
index 1eae8057d0..e6c894463b 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
|
2019-05-05 17:19:34 +00:00
|
|
|
@@ -62,7 +62,7 @@ public abstract class PlayerList {
|
2019-03-02 21:23:06 +00:00
|
|
|
// private final Map<UUID, AdvancementDataPlayer> p;
|
|
|
|
// CraftBukkit end
|
|
|
|
public IPlayerFileData playerFileData;
|
|
|
|
- private boolean hasWhitelist;
|
2019-05-05 17:19:34 +00:00
|
|
|
+ //private boolean hasWhitelist;
|
|
|
|
protected final int maxPlayers;
|
2019-05-14 02:20:58 +00:00
|
|
|
private int viewDistance;
|
2019-03-02 21:23:06 +00:00
|
|
|
private EnumGamemode t;
|
2019-05-14 02:20:58 +00:00
|
|
|
@@ -899,9 +899,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) {
|
2019-05-14 02:20:58 +00:00
|
|
|
@@ -1030,11 +1030,11 @@ public abstract class PlayerList {
|
2019-03-02 21:23:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean getHasWhitelist() {
|
|
|
|
- return this.hasWhitelist;
|
|
|
|
+ return this.whitelist.isEnabled(); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
public void setHasWhitelist(boolean flag) {
|
|
|
|
- this.hasWhitelist = flag;
|
|
|
|
+ this.whitelist.setEnabled(flag); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
public List<EntityPlayer> b(String s) {
|
|
|
|
--
|
2019-03-20 00:28:15 +00:00
|
|
|
2.21.0
|
2019-03-02 21:23:06 +00:00
|
|
|
|