2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 3 Jul 2017 18:11:10 -0500
Subject: [PATCH] ProfileWhitelistVerifyEvent
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
2022-09-26 08:02:51 +00:00
index f86d3dfcc19f6f9383d21044f61aa5246cf1f9e5..399735c923cfd52bd7b67beb9b974585ab507ca9 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
2022-09-01 16:51:59 +00:00
@@ -621,9 +621,9 @@ public abstract class PlayerList {
2021-06-11 12:02:28 +00:00
// return chatmessage;
2022-06-07 20:12:48 +00:00
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, PaperAdventure.asAdventure(ichatmutablecomponent)); // Paper - Adventure
2021-06-11 12:02:28 +00:00
- } else if (!this.isWhiteListed(gameprofile)) {
2022-06-07 20:12:48 +00:00
- ichatmutablecomponent = Component.translatable("multiplayer.disconnect.not_whitelisted");
2022-05-26 19:12:14 +00:00
- event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.whitelistMessage)); // Spigot // Paper - Adventure
2022-06-07 20:12:48 +00:00
+ } else if (!this.isWhiteListed(gameprofile, event)) { // Paper
+ //ichatmutablecomponent = Component.translatable("multiplayer.disconnect.not_whitelisted"); // Paper
+ //event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.whitelistMessage)); // Spigot // Paper - Adventure - moved to isWhitelisted
2021-06-12 11:18:01 +00:00
} else if (this.getIpBans().isBanned(socketaddress) && !this.getIpBans().get(socketaddress).hasExpired()) {
2021-06-11 12:02:28 +00:00
IpBanListEntry ipbanentry = this.ipBans.get(socketaddress);
2022-09-01 16:51:59 +00:00
@@ -1005,7 +1005,23 @@ public abstract class PlayerList {
2021-06-11 12:02:28 +00:00
}
public boolean isWhiteListed(GameProfile profile) {
- return !this.doWhiteList || this.ops.contains(profile) || this.whitelist.contains(profile);
2022-06-07 21:15:14 +00:00
+ // Paper start
+ return isWhiteListed(profile, null);
2022-06-07 20:12:48 +00:00
+ }
2022-06-07 21:15:14 +00:00
+ public boolean isWhiteListed(GameProfile gameprofile, org.bukkit.event.player.PlayerLoginEvent loginEvent) {
2021-06-11 12:02:28 +00:00
+ boolean isOp = this.ops.contains(gameprofile);
+ boolean isWhitelisted = !this.doWhiteList || isOp || this.whitelist.contains(gameprofile);
+ final com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent event;
2021-06-12 11:18:01 +00:00
+ event = new com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent(net.minecraft.server.MCUtil.toBukkit(gameprofile), this.doWhiteList, isWhitelisted, isOp, org.spigotmc.SpigotConfig.whitelistMessage);
2021-06-11 12:02:28 +00:00
+ event.callEvent();
+ if (!event.isWhitelisted()) {
+ if (loginEvent != null) {
2022-05-26 19:12:14 +00:00
+ loginEvent.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(event.getKickMessage() == null ? org.spigotmc.SpigotConfig.whitelistMessage : event.getKickMessage()));
2021-06-11 12:02:28 +00:00
+ }
+ return false;
+ }
+ return true;
2022-06-07 21:15:14 +00:00
+ // Paper end
2022-06-07 20:12:48 +00:00
}
2021-06-11 12:02:28 +00:00
public boolean isOp(GameProfile profile) {