51 lines
3.2 KiB
Diff
51 lines
3.2 KiB
Diff
|
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
|
||
|
|
index 7d6256f65d369fcbcfe1fffe7ac264788a38540b..ae60b233c4d56a4964b388f96e9cc66410774e8d 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -611,9 +611,9 @@ public abstract class PlayerList {
|
||
|
|
|
||
|
|
// return chatmessage;
|
||
|
|
if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, PaperAdventure.asAdventure(chatmessage)); // Spigot // Paper - Adventure
|
||
|
|
- } else if (!this.isWhiteListed(gameprofile)) {
|
||
|
|
- chatmessage = new TranslatableComponent("multiplayer.disconnect.not_whitelisted");
|
||
|
|
- event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, PaperAdventure.LEGACY_SECTION_UXRC.deserialize(org.spigotmc.SpigotConfig.whitelistMessage)); // Spigot // Paper - Adventure
|
||
|
|
+ } else if (!this.isWhitelisted(gameprofile, event)) { // Paper
|
||
|
|
+ //chatmessage = new ChatMessage("multiplayer.disconnect.not_whitelisted"); // Paper
|
||
|
|
+ //event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot // Paper - moved to isWhitelisted
|
||
|
|
} else if (getIpBans().isBanned(socketaddress) && !getIpBans().get(socketaddress).hasExpired()) {
|
||
|
|
IpBanListEntry ipbanentry = this.ipBans.get(socketaddress);
|
||
|
|
|
||
|
|
@@ -1005,9 +1005,25 @@ public abstract class PlayerList {
|
||
|
|
this.server.getCommands().sendCommands(player);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
public boolean isWhiteListed(GameProfile profile) {
|
||
|
|
- return !this.doWhiteList || this.ops.contains(profile) || this.whitelist.contains(profile);
|
||
|
|
+ return isWhitelisted(profile, null);
|
||
|
|
}
|
||
|
|
+ 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);
|
||
|
|
+ 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.callEvent();
|
||
|
|
+ if (!event.isWhitelisted()) {
|
||
|
|
+ if (loginEvent != null) {
|
||
|
|
+ loginEvent.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, PaperAdventure.LEGACY_SECTION_UXRC.deserialize(event.getKickMessage() == null ? org.spigotmc.SpigotConfig.whitelistMessage : event.getKickMessage()));
|
||
|
|
+ }
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+ return true;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
public boolean isOp(GameProfile profile) {
|
||
|
|
return this.ops.contains(profile) || this.server.isSingleplayerOwner(profile) && this.server.getWorldData().getAllowCommands() || this.allowCheatsForAllPlayers;
|