Add player whitelist events (#9209)

2023-07-23 06:38:53 +02:00 · 2023-07-23 06:38:53 +02:00 · 42830546f3
parent e19177a2c3
commit 42830546f3
2 changed files with 129 additions and 0 deletions
--- a/patches/api/0422-Add-whitelist-events.patch
+++ b/patches/api/0422-Add-whitelist-events.patch
@ -0,0 +1,95 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SageSphinx63920 <sage@sagesphinx63920.dev>
+Date: Sun, 14 May 2023 12:56:15 +0200
+Subject: [PATCH] Add whitelist events
+
+
+diff --git a/src/main/java/io/papermc/paper/event/server/WhitelistStateUpdateEvent.java b/src/main/java/io/papermc/paper/event/server/WhitelistStateUpdateEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..34bcdc9a3c3426e17c1905dc3dbad762c0fe3f41
+--- /dev/null
+++ b/src/main/java/io/papermc/paper/event/server/WhitelistStateUpdateEvent.java
+@@ -0,0 +1,83 @@
+package io.papermc.paper.event.server;
+
+import com.destroystokyo.paper.profile.PlayerProfile;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * This event gets called when the whitelist status of a player is changed
+ */
+public class WhitelistStateUpdateEvent extends Event implements Cancellable {
+
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+    private boolean cancel = false;
+    @NotNull private final PlayerProfile playerProfile;
+    @NotNull private final WhitelistStatus status;
+
+    public WhitelistStateUpdateEvent(@NotNull PlayerProfile who, @NotNull WhitelistStatus status) {
+        this.playerProfile = who;
+        this.status = status;
+    }
+
+    /**
+     * Gets the player whose whitelist status is being changed
+     *
+     * @return the player whose status is being changed
+     */
+    @NotNull
+    public OfflinePlayer getPlayer() {
+        return Bukkit.getOfflinePlayer(playerProfile.getId());
+    }
+
+    /**
+     * Gets the player profile whose whitelist status is being changed
+     *
+     * @return the player profile whose status is being changed
+     */
+    @NotNull
+    public PlayerProfile getPlayerProfile() {
+        return playerProfile;
+    }
+
+    /**
+     * Gets the status change of the player profile
+     *
+     * @return the whitelist status
+     */
+    @NotNull
+    public WhitelistStatus getStatus() {
+        return status;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+    /**
+     * Enum for the whitelist status changes
+     */
+    public enum WhitelistStatus {
+        ADDED, REMOVED
+    }
+}
--- a/patches/server/0993-Add-whitelist-events.patch
+++ b/patches/server/0993-Add-whitelist-events.patch
@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SageSphinx63920 <sage@sagesphinx63920.dev>
+Date: Sun, 14 May 2023 12:57:15 +0200
+Subject: [PATCH] Add whitelist events
+
+
+diff --git a/src/main/java/net/minecraft/server/players/UserWhiteList.java b/src/main/java/net/minecraft/server/players/UserWhiteList.java
+index a6c70decad1a496595944a5dd2aeeb387757fef3..e5c218833f5bcb1c908cd62bdc57cc5152d37be5 100644
+--- a/src/main/java/net/minecraft/server/players/UserWhiteList.java
+++ b/src/main/java/net/minecraft/server/players/UserWhiteList.java
+@@ -30,4 +30,23 @@ public class UserWhiteList extends StoredUserList<GameProfile, UserWhiteListEntr
+     protected String getKeyForUser(GameProfile gameProfile) {
+         return gameProfile.getId().toString();
+     }
+    // Paper start - Add whitelist events
+    @Override
+    public void add(UserWhiteListEntry entry) {
+        if (!new io.papermc.paper.event.server.WhitelistStateUpdateEvent(com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitCopy(entry.getUser()), io.papermc.paper.event.server.WhitelistStateUpdateEvent.WhitelistStatus.ADDED).callEvent()) {
+            return;
+        }
+
+        super.add(entry);
+    }
+
+    @Override
+    public void remove(GameProfile profile) {
+        if (!new io.papermc.paper.event.server.WhitelistStateUpdateEvent(com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitCopy(profile), io.papermc.paper.event.server.WhitelistStateUpdateEvent.WhitelistStatus.REMOVED).callEvent()) {
+            return;
+        }
+
+        super.remove(profile);
+    }
+    // Paper end
+ }