From bf2be652f0a1aeb54b92a77471796e08b47fbf92 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 22:51:42 +0200 Subject: [PATCH] Add WhitelistToggleEvent (#1899) --- .../0174-Add-WhitelistToggleEvent.patch | 52 +++++++++++++++++++ ...oggleEvent-when-whitelist-is-toggled.patch | 21 ++++++++ 2 files changed, 73 insertions(+) create mode 100644 Spigot-API-Patches/0174-Add-WhitelistToggleEvent.patch create mode 100644 Spigot-Server-Patches/0424-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/Spigot-API-Patches/0174-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0174-Add-WhitelistToggleEvent.patch new file mode 100644 index 0000000000..d750f3e3e9 --- /dev/null +++ b/Spigot-API-Patches/0174-Add-WhitelistToggleEvent.patch @@ -0,0 +1,52 @@ +From 747fc969fefd90f81fb2ad1eb1153da08fe8fc42 Mon Sep 17 00:00:00 2001 +From: Mark Vainomaa +Date: Wed, 13 Mar 2019 20:04:43 +0200 +Subject: [PATCH] Add WhitelistToggleEvent + + +diff --git a/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java +new file mode 100644 +index 00000000..e7b785e7 +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java +@@ -0,0 +1,37 @@ ++package com.destroystokyo.paper.event.server; ++ ++import org.bukkit.event.Event; ++import org.bukkit.event.HandlerList; ++ ++/** ++ * This event is fired when whitelist is toggled ++ * ++ * @author Mark Vainomaa ++ */ ++public class WhitelistToggleEvent extends Event { ++ private static final HandlerList handlers = new HandlerList(); ++ ++ private boolean enabled; ++ ++ public WhitelistToggleEvent(boolean enabled) { ++ this.enabled = enabled; ++ } ++ ++ /** ++ * Gets whether whitelist is going to be enabled or not ++ * ++ * @return Whether whitelist is going to be enabled or not ++ */ ++ public boolean isEnabled() { ++ return enabled; ++ } ++ ++ @Override ++ public HandlerList getHandlers() { ++ return handlers; ++ } ++ ++ public static HandlerList getHandlerList() { ++ return handlers; ++ } ++} +-- +2.21.0 + diff --git a/Spigot-Server-Patches/0424-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0424-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch new file mode 100644 index 0000000000..1660618715 --- /dev/null +++ b/Spigot-Server-Patches/0424-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -0,0 +1,21 @@ +From f299fb452e762d8c151e19ac018f541861085903 Mon Sep 17 00:00:00 2001 +From: Mark Vainomaa +Date: Wed, 13 Mar 2019 20:08:09 +0200 +Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled + + +diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java +index 408c382d..b1630137 100644 +--- a/src/main/java/net/minecraft/server/PlayerList.java ++++ b/src/main/java/net/minecraft/server/PlayerList.java +@@ -1329,6 +1329,7 @@ public abstract class PlayerList { + } + + public void setHasWhitelist(boolean flag) { ++ new com.destroystokyo.paper.event.server.WhitelistToggleEvent(flag).callEvent(); + this.whitelist.setEnabled(flag); // Paper + } + +-- +2.21.0 +