mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-28 17:27:20 +01:00
a73ed9572e
Upstream has released updates that appear 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: b76ceb4f5 PR-1235: Move EntityType return to base Entity class e795d7490 SPIGOT-7458: Exception when Entity CommandSender executes Vanilla command 46c7fc3b1 SPIGOT-7452: Player#openSign cannot edit d91e5aa0b SPIGOT-7447: Rewrite --forceUpgrade to minimise diff and properly handle CraftBukkit world layout 921ae06d6 Revert "SPIGOT-7447: Fix --forceUpgrade" Spigot Changes: 94e187b5 Rebuild patches 3bce7935 SPIGOT-7091: Update bungeecord-chat
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
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
|
|
}
|