Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update PlayerList.java

Browse Source
This commit is contained in:
FatSaw
2023-02-18 05:43:12 +02:00
parent dd01cae8fe
commit 39670d24e1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/src/main/java/net/minecraft/server/PlayerList.java
View File

@@ -71,7 +71,7 @@ public abstract class PlayerList {
// private final Map<UUID, AdvancementDataPlayer> p; // private final Map<UUID, AdvancementDataPlayer> p;
// CraftBukkit end // CraftBukkit end
public IPlayerFileData playerFileData; public IPlayerFileData playerFileData;
private boolean hasWhitelist; //private boolean hasWhitelist; // Paper - moved to whitelist object so not duplicated
protected int maxPlayers; protected int maxPlayers;
private int s; private int s;
private EnumGamemode t; private EnumGamemode t;
@@ -1241,9 +1241,9 @@ public abstract class PlayerList {
} }
public boolean isWhitelisted(GameProfile gameprofile, org.bukkit.event.player.PlayerLoginEvent loginEvent) { public boolean isWhitelisted(GameProfile gameprofile, org.bukkit.event.player.PlayerLoginEvent loginEvent) {
boolean isOp = this.operators.d(gameprofile); 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; 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(); event.callEvent();
if (!event.isWhitelisted()) { if (!event.isWhitelisted()) {
if (loginEvent != null) { if (loginEvent != null) {
@@ -1392,11 +1392,11 @@ public abstract class PlayerList {
} }
public boolean getHasWhitelist() { public boolean getHasWhitelist() {
return this.hasWhitelist; return this.whitelist.isEnabled(); // Paper
} }
public void setHasWhitelist(boolean flag) { public void setHasWhitelist(boolean flag) {
this.hasWhitelist = flag; this.whitelist.setEnabled(flag); // Paper
} }
public List<EntityPlayer> b(String s) { public List<EntityPlayer> b(String s) {