core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0335-MC-145260-Fix-Whitelis...

29 lines
1.7 KiB
Diff
Raw Normal View History

Rebuild all patches using the new rebuild pattern
2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
MC-145260: Fix Whitelist On/Off inconsistency - Fixes #1880 Mojang stored whitelist state in 2 places (Whitelist Object, PlayerList) some things checked PlayerList, some checked object. This moves everything to the Whitelist object.
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
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: e14c9acbe SPIGOT-6113: Ender Pearls thrown into portals that lead to disabled dimensions crash the server 97da39889 SPIGOT-6114: PlayerRespawnEvent player's location changed before event called 3b5c36769 SPIGOT-6115: Items being deleted on pick up with full inventory
2020-08-28 02:37:10 +00:00
index 9a56f83e12c65cafe3d1fb00379b78e5ea59b3f1..e9c2fa0fe81320c5953b7dc4ec1cfdedc76068b6 100644
MC-145260: Fix Whitelist On/Off inconsistency - Fixes #1880 Mojang stored whitelist state in 2 places (Whitelist Object, PlayerList) some things checked PlayerList, some checked object. This moves everything to the Whitelist object.
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
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: e14c9acbe SPIGOT-6113: Ender Pearls thrown into portals that lead to disabled dimensions crash the server 97da39889 SPIGOT-6114: PlayerRespawnEvent player's location changed before event called 3b5c36769 SPIGOT-6115: Items being deleted on pick up with full inventory
2020-08-28 02:37:10 +00:00
@@ -941,9 +941,9 @@ public abstract class PlayerList {
MC-145260: Fix Whitelist On/Off inconsistency - Fixes #1880 Mojang stored whitelist state in 2 places (Whitelist Object, PlayerList) some things checked PlayerList, some checked object. This moves everything to the Whitelist object.
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) {