53 lines
2.7 KiB
Diff
53 lines
2.7 KiB
Diff
|
From 1f4300aee18c3589dc5031b8f4958672eb951212 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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
index c47e05c19..a038d0987 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
@@ -536,9 +536,9 @@ public abstract class PlayerList {
|
||
|
|
|
||
|
|
// return s;
|
||
|
|
if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s); // Spigot
|
||
|
|
- } else if (!this.isWhitelisted(gameprofile)) {
|
||
|
|
+ } else if (!this.isWhitelisted(gameprofile, event)) { // Paper
|
||
|
|
// return "You are not white-listed on this server!";
|
||
|
|
- event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
|
||
|
|
+ //event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot // Paper - moved to isWhitelisted
|
||
|
|
} else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
|
||
|
|
IpBanEntry ipbanentry = this.l.get(socketaddress);
|
||
|
|
|
||
|
|
@@ -1200,9 +1200,25 @@ public abstract class PlayerList {
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
public boolean isWhitelisted(GameProfile gameprofile) {
|
||
|
|
- return !this.hasWhitelist || this.operators.d(gameprofile) || this.whitelist.d(gameprofile);
|
||
|
|
+ return isWhitelisted(gameprofile, null);
|
||
|
|
+ }
|
||
|
|
+ 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);
|
||
|
|
+ final com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent event;
|
||
|
|
+ event = new com.destroystokyo.paper.event.profile.ProfileWhitelistVerifyEvent(gameprofile, this.hasWhitelist, isWhitelisted, isOp, org.spigotmc.SpigotConfig.whitelistMessage);
|
||
|
|
+ event.callEvent();
|
||
|
|
+ if (!event.isWhitelisted()) {
|
||
|
|
+ if (loginEvent != null) {
|
||
|
|
+ loginEvent.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, event.getKickMessage() == null ? org.spigotmc.SpigotConfig.whitelistMessage : event.getKickMessage());
|
||
|
|
+ }
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+ return true;
|
||
|
|
}
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
public boolean isOp(GameProfile gameprofile) {
|
||
|
|
return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit
|
||
|
|
--
|
||
|
|
2.13.0
|
||
|
|
|