mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
46 lines
2.7 KiB
Diff
46 lines
2.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
index 5b71b487836cdd2ddc75b2039f4dc0177719d345..8d133d3c825f7747081de99ee67d4556e5c19cdd 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.ClientboundUpdateMobEffectPacket;
|
||
|
|
import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
|
||
|
|
import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
|
||
|
|
import net.minecraft.resources.ResourceKey;
|
||
|
|
+import net.minecraft.server.MCUtil;
|
||
|
|
import net.minecraft.server.MinecraftServer;
|
||
|
|
import net.minecraft.server.PlayerAdvancements;
|
||
|
|
import net.minecraft.server.ServerScoreboard;
|
||
|
|
@@ -1012,9 +1013,9 @@ public abstract class PlayerList {
|
||
|
|
}
|
||
|
|
public boolean isWhitelisted(GameProfile gameprofile, org.bukkit.event.player.PlayerLoginEvent loginEvent) {
|
||
|
|
boolean isOp = this.ops.contains(gameprofile);
|
||
|
|
- boolean isWhitelisted = !this.doWhiteList || isOp || this.whitelist.contains(gameprofile);
|
||
|
|
+ boolean isWhitelisted = !this.isUsingWhitelist() || isOp || this.whitelist.contains(gameprofile);
|
||
|
|
final com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent event;
|
||
|
|
- event = new com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent(MCUtil.toBukkit(gameprofile), this.doWhiteList, isWhitelisted, isOp, org.spigotmc.SpigotConfig.whitelistMessage);
|
||
|
|
+ event = new com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent(MCUtil.toBukkit(gameprofile), this.isUsingWhitelist(), isWhitelisted, isOp, org.spigotmc.SpigotConfig.whitelistMessage);
|
||
|
|
event.callEvent();
|
||
|
|
if (!event.isWhitelisted()) {
|
||
|
|
if (loginEvent != null) {
|
||
|
|
@@ -1062,7 +1063,7 @@ public abstract class PlayerList {
|
||
|
|
MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
|
||
|
|
MinecraftTimings.savePlayers.startTiming(); // Paper
|
||
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
||
|
|
- this.savePlayerFile((EntityPlayer) this.players.get(i));
|
||
|
|
+ this.save((ServerPlayer) this.players.get(i));
|
||
|
|
}
|
||
|
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
||
|
|
return null; }); // Paper - ensure main
|