From 0224cf997f3695367418fde2197fd9cea0381f7e Mon Sep 17 00:00:00 2001 From: James Mortemore Date: Tue, 10 Feb 2026 16:42:37 +0000 Subject: [PATCH] fix: silent propagation for unban/unmutes --- .../banmanager/bukkit/BukkitServer.java | 12 ++--- .../bukkit/api/events/IpRangeUnbanEvent.java | 9 ++-- .../bukkit/api/events/IpUnbanEvent.java | 9 ++-- .../bukkit/api/events/IpUnmutedEvent.java | 9 ++-- .../bukkit/api/events/NameUnbanEvent.java | 9 ++-- .../bukkit/api/events/PlayerUnbanEvent.java | 9 ++-- .../bukkit/api/events/PlayerUnmuteEvent.java | 9 ++-- .../bukkit/listeners/WebhookListener.java | 6 +-- .../banmanager/bungee/BungeeServer.java | 12 ++--- .../bungee/api/events/IpRangeUnbanEvent.java | 9 ++-- .../bungee/api/events/IpUnbanEvent.java | 9 ++-- .../bungee/api/events/IpUnmutedEvent.java | 9 ++-- .../bungee/api/events/NameUnbanEvent.java | 9 ++-- .../bungee/api/events/PlayerUnbanEvent.java | 9 ++-- .../bungee/api/events/PlayerUnmuteEvent.java | 9 ++-- .../bungee/listeners/WebhookListener.java | 6 +-- .../confuser/banmanager/common/api/BmAPI.java | 44 +++++++++++++++++++ .../common/commands/UnbanCommand.java | 2 +- .../common/commands/UnbanIpCommand.java | 2 +- .../common/commands/UnbanIpRangeCommand.java | 2 +- .../common/commands/UnbanNameCommand.java | 2 +- .../common/commands/UnmuteCommand.java | 2 +- .../common/commands/UnmuteIpCommand.java | 2 +- .../common/storage/IpBanStorage.java | 6 ++- .../common/storage/IpMuteStorage.java | 6 ++- .../common/storage/IpRangeBanStorage.java | 6 ++- .../common/storage/NameBanStorage.java | 6 ++- .../common/storage/PlayerBanStorage.java | 6 ++- .../common/storage/PlayerMuteStorage.java | 8 +++- .../banmanager/fabric/BanManagerEvents.java | 36 +++++++-------- .../banmanager/fabric/FabricServer.java | 24 +++++----- .../fabric/listeners/HookListener.java | 8 ++-- .../fabric/listeners/WebhookListener.java | 12 ++--- .../banmanager/sponge/SpongeServer.java | 12 ++--- .../sponge/api/events/IpRangeUnbanEvent.java | 9 ++-- .../sponge/api/events/IpUnbanEvent.java | 9 ++-- .../sponge/api/events/IpUnmutedEvent.java | 9 ++-- .../sponge/api/events/NameUnbanEvent.java | 9 ++-- .../sponge/api/events/PlayerUnbanEvent.java | 9 ++-- .../sponge/api/events/PlayerUnmuteEvent.java | 9 ++-- .../sponge/listeners/WebhookListener.java | 6 +-- .../banmanager/sponge/SpongeServer.java | 12 ++--- .../sponge/api/events/IpRangeUnbanEvent.java | 8 +++- .../sponge/api/events/IpUnbanEvent.java | 8 +++- .../sponge/api/events/IpUnmutedEvent.java | 8 +++- .../sponge/api/events/NameUnbanEvent.java | 8 +++- .../sponge/api/events/PlayerUnbanEvent.java | 8 +++- .../sponge/api/events/PlayerUnmuteEvent.java | 8 +++- .../sponge/listeners/WebhookListener.java | 6 +-- .../banmanager/velocity/VelocityServer.java | 12 ++--- .../api/events/IpRangeUnbanEvent.java | 9 ++-- .../velocity/api/events/IpUnbanEvent.java | 9 ++-- .../velocity/api/events/IpUnmutedEvent.java | 9 ++-- .../velocity/api/events/NameUnbanEvent.java | 9 ++-- .../velocity/api/events/PlayerUnbanEvent.java | 9 ++-- .../api/events/PlayerUnmuteEvent.java | 9 ++-- .../velocity/listeners/WebhookListener.java | 6 +-- 57 files changed, 346 insertions(+), 182 deletions(-) diff --git a/bukkit/src/main/java/me/confuser/banmanager/bukkit/BukkitServer.java b/bukkit/src/main/java/me/confuser/banmanager/bukkit/BukkitServer.java index e37749668..651449d63 100644 --- a/bukkit/src/main/java/me/confuser/banmanager/bukkit/BukkitServer.java +++ b/bukkit/src/main/java/me/confuser/banmanager/bukkit/BukkitServer.java @@ -132,7 +132,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]); break; case "PlayerUnbanEvent": - event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpBanEvent": @@ -142,7 +142,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpBannedEvent((IpBanData) args[0], (boolean) args[1]); break; case "IpUnbanEvent": - event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpMuteEvent": @@ -152,7 +152,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpMutedEvent((IpMuteData) args[0], (boolean) args[1]); break; case "IpUnmutedEvent": - event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerKickedEvent": @@ -180,7 +180,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new NameBannedEvent((NameBanData) args[0], (boolean) args[1]); break; case "NameUnbanEvent": - event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerWarnEvent": @@ -197,7 +197,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpRangeBannedEvent((IpRangeBanData) args[0], (boolean) args[1]); break; case "IpRangeUnbanEvent": - event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerMuteEvent": @@ -207,7 +207,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerMutedEvent((PlayerMuteData) args[0], (boolean) args[1]); break; case "PlayerUnmuteEvent": - event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PluginReloadedEvent": diff --git a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpRangeUnbanEvent.java b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpRangeUnbanEvent.java index 9feda9da6..e673913a2 100644 --- a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpRangeUnbanEvent.java +++ b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpRangeUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpRangeUnbanEvent extends CustomCancellableEvent { +public class IpRangeUnbanEvent extends SilentCancellableEvent { @Getter private IpRangeBanData ban; @@ -13,9 +13,12 @@ public class IpRangeUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason) { - super(true); + this(ban, actor, reason, false); + } + + public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent, true); this.ban = ban; this.actor = actor; diff --git a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpUnbanEvent.java b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpUnbanEvent.java index 841f3746b..7ccff770f 100644 --- a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpUnbanEvent.java +++ b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpUnbanEvent extends CustomCancellableEvent { +public class IpUnbanEvent extends SilentCancellableEvent { @Getter private IpBanData ban; @@ -13,9 +13,12 @@ public class IpUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason) { - super(true); + this(ban, actor, reason, false); + } + + public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent, true); this.ban = ban; this.actor = actor; diff --git a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpUnmutedEvent.java b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpUnmutedEvent.java index a30a5c147..91d68e1e5 100644 --- a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpUnmutedEvent.java +++ b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/IpUnmutedEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpUnmutedEvent extends CustomCancellableEvent { +public class IpUnmutedEvent extends SilentCancellableEvent { @Getter private IpMuteData mute; @@ -13,9 +13,12 @@ public class IpUnmutedEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason) { - super(true); + this(mute, actor, reason, false); + } + + public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent, true); this.mute = mute; this.actor = actor; diff --git a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/NameUnbanEvent.java b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/NameUnbanEvent.java index 7cc71fbfa..4f7195a79 100644 --- a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/NameUnbanEvent.java +++ b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/NameUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class NameUnbanEvent extends CustomCancellableEvent { +public class NameUnbanEvent extends SilentCancellableEvent { @Getter private NameBanData ban; @@ -13,9 +13,12 @@ public class NameUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason) { - super(true); + this(ban, actor, reason, false); + } + + public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent, true); this.ban = ban; this.actor = actor; diff --git a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/PlayerUnbanEvent.java b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/PlayerUnbanEvent.java index 2f59f8f62..2fe0f84c6 100644 --- a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/PlayerUnbanEvent.java +++ b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/PlayerUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class PlayerUnbanEvent extends CustomCancellableEvent { +public class PlayerUnbanEvent extends SilentCancellableEvent { @Getter private PlayerBanData ban; @@ -13,9 +13,12 @@ public class PlayerUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason) { - super(true); + this(ban, actor, reason, false); + } + + public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent, true); this.ban = ban; this.actor = actor; diff --git a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/PlayerUnmuteEvent.java b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/PlayerUnmuteEvent.java index 798255f45..790cf67d0 100644 --- a/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/PlayerUnmuteEvent.java +++ b/bukkit/src/main/java/me/confuser/banmanager/bukkit/api/events/PlayerUnmuteEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerMuteData; -public class PlayerUnmuteEvent extends CustomCancellableEvent { +public class PlayerUnmuteEvent extends SilentCancellableEvent { @Getter private PlayerMuteData mute; @@ -13,9 +13,12 @@ public class PlayerUnmuteEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason) { - super(true); + this(mute, actor, reason, false); + } + + public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent, true); this.mute = mute; this.actor = actor; diff --git a/bukkit/src/main/java/me/confuser/banmanager/bukkit/listeners/WebhookListener.java b/bukkit/src/main/java/me/confuser/banmanager/bukkit/listeners/WebhookListener.java index d9e6558e4..fc8acde22 100644 --- a/bukkit/src/main/java/me/confuser/banmanager/bukkit/listeners/WebhookListener.java +++ b/bukkit/src/main/java/me/confuser/banmanager/bukkit/listeners/WebhookListener.java @@ -50,19 +50,19 @@ public void notifyOnWarn(PlayerWarnedEvent event) { @EventHandler(priority = EventPriority.MONITOR) public void notifyOnUnban(PlayerUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @EventHandler(priority = EventPriority.MONITOR) public void notifyOnUnban(IpUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @EventHandler(priority = EventPriority.MONITOR) public void notifyOnUnmute(PlayerUnmuteEvent event) { List webhooks = listener.notifyOnUnmute(event.getMute(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @EventHandler(priority = EventPriority.MONITOR) diff --git a/bungee/src/main/java/me/confuser/banmanager/bungee/BungeeServer.java b/bungee/src/main/java/me/confuser/banmanager/bungee/BungeeServer.java index e0310818a..38fb9a518 100755 --- a/bungee/src/main/java/me/confuser/banmanager/bungee/BungeeServer.java +++ b/bungee/src/main/java/me/confuser/banmanager/bungee/BungeeServer.java @@ -117,7 +117,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]); break; case "PlayerUnbanEvent": - event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpBanEvent": @@ -127,7 +127,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpBannedEvent((IpBanData) args[0], (boolean) args[1]); break; case "IpUnbanEvent": - event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpMuteEvent": @@ -137,7 +137,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpMutedEvent((IpMuteData) args[0], (boolean) args[1]); break; case "IpUnmutedEvent": - event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerKickedEvent": @@ -165,7 +165,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new NameBannedEvent((NameBanData) args[0], (boolean) args[1]); break; case "NameUnbanEvent": - event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerWarnEvent": @@ -182,7 +182,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpRangeBannedEvent((IpRangeBanData) args[0], (boolean) args[1]); break; case "IpRangeUnbanEvent": - event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerMuteEvent": @@ -192,7 +192,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerMutedEvent((PlayerMuteData) args[0], (boolean) args[1]); break; case "PlayerUnmuteEvent": - event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PluginReloadedEvent": diff --git a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpRangeUnbanEvent.java b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpRangeUnbanEvent.java index 164819d07..cb5626529 100755 --- a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpRangeUnbanEvent.java +++ b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpRangeUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpRangeUnbanEvent extends CustomCancellableEvent { +public class IpRangeUnbanEvent extends SilentCancellableEvent { @Getter private IpRangeBanData ban; @@ -13,9 +13,12 @@ public class IpRangeUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpUnbanEvent.java b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpUnbanEvent.java index 9a9f1a00b..5ab9b81c1 100755 --- a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpUnbanEvent.java +++ b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpUnbanEvent extends CustomCancellableEvent { +public class IpUnbanEvent extends SilentCancellableEvent { @Getter private IpBanData ban; @@ -13,9 +13,12 @@ public class IpUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpUnmutedEvent.java b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpUnmutedEvent.java index 97c06db5d..446e50eb5 100755 --- a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpUnmutedEvent.java +++ b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/IpUnmutedEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpUnmutedEvent extends CustomCancellableEvent { +public class IpUnmutedEvent extends SilentCancellableEvent { @Getter private IpMuteData mute; @@ -13,9 +13,12 @@ public class IpUnmutedEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason) { - super(); + this(mute, actor, reason, false); + } + + public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent); this.mute = mute; this.actor = actor; diff --git a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/NameUnbanEvent.java b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/NameUnbanEvent.java index cd08cc747..0aa9b53c9 100755 --- a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/NameUnbanEvent.java +++ b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/NameUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class NameUnbanEvent extends CustomCancellableEvent { +public class NameUnbanEvent extends SilentCancellableEvent { @Getter private NameBanData ban; @@ -13,9 +13,12 @@ public class NameUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/PlayerUnbanEvent.java b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/PlayerUnbanEvent.java index e64aa2ca2..66f2c0a73 100755 --- a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/PlayerUnbanEvent.java +++ b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/PlayerUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class PlayerUnbanEvent extends CustomCancellableEvent { +public class PlayerUnbanEvent extends SilentCancellableEvent { @Getter private PlayerBanData ban; @@ -13,9 +13,12 @@ public class PlayerUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/PlayerUnmuteEvent.java b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/PlayerUnmuteEvent.java index 3a9196da4..f36a27a1d 100755 --- a/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/PlayerUnmuteEvent.java +++ b/bungee/src/main/java/me/confuser/banmanager/bungee/api/events/PlayerUnmuteEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerMuteData; -public class PlayerUnmuteEvent extends CustomCancellableEvent { +public class PlayerUnmuteEvent extends SilentCancellableEvent { @Getter private PlayerMuteData mute; @@ -13,9 +13,12 @@ public class PlayerUnmuteEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason) { - super(); + this(mute, actor, reason, false); + } + + public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent); this.mute = mute; this.actor = actor; diff --git a/bungee/src/main/java/me/confuser/banmanager/bungee/listeners/WebhookListener.java b/bungee/src/main/java/me/confuser/banmanager/bungee/listeners/WebhookListener.java index 425edecfb..397735bf3 100644 --- a/bungee/src/main/java/me/confuser/banmanager/bungee/listeners/WebhookListener.java +++ b/bungee/src/main/java/me/confuser/banmanager/bungee/listeners/WebhookListener.java @@ -50,19 +50,19 @@ public void notifyOnWarn(PlayerWarnedEvent event) { @EventHandler(priority = EventPriority.HIGHEST) public void notifyOnUnban(PlayerUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @EventHandler(priority = EventPriority.HIGHEST) public void notifyOnUnban(IpUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @EventHandler(priority = EventPriority.HIGHEST) public void notifyOnUnmute(PlayerUnmuteEvent event) { List webhooks = listener.notifyOnUnmute(event.getMute(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @EventHandler(priority = EventPriority.HIGHEST) diff --git a/common/src/main/java/me/confuser/banmanager/common/api/BmAPI.java b/common/src/main/java/me/confuser/banmanager/common/api/BmAPI.java index 5fd4e15d6..03470206e 100644 --- a/common/src/main/java/me/confuser/banmanager/common/api/BmAPI.java +++ b/common/src/main/java/me/confuser/banmanager/common/api/BmAPI.java @@ -122,6 +122,17 @@ public static boolean unban(PlayerBanData ban, PlayerData actor) throws SQLExcep return BanManagerPlugin.getInstance().getPlayerBanStorage().unban(ban, actor); } + /** + * @param ban The ban (can be retrieved via getBan) + * @param actor Who is unbanning the player + * @param silent Whether the unban should be treated as silent + * @return Returns true if the unban is successful + * @throws SQLException + */ + public static boolean unban(PlayerBanData ban, PlayerData actor, boolean silent) throws SQLException { + return BanManagerPlugin.getInstance().getPlayerBanStorage().unban(ban, actor, "", false, silent); + } + /** * Thread safe * @@ -268,6 +279,17 @@ public static boolean unmute(PlayerMuteData mute, PlayerData actor) throws SQLEx return BanManagerPlugin.getInstance().getPlayerMuteStorage().unmute(mute, actor); } + /** + * @param mute PlayerMuteData + * @param actor Who unmuted the player + * @param silent Whether the unmute should be treated as silent + * @return Returns true if unmute successful + * @throws SQLException + */ + public static boolean unmute(PlayerMuteData mute, PlayerData actor, boolean silent) throws SQLException { + return BanManagerPlugin.getInstance().getPlayerMuteStorage().unmute(mute, actor, "", false, silent); + } + /** * @param mute IP Mute record * @param actor Who unmuted the ip @@ -278,6 +300,17 @@ public static boolean unmute(IpMuteData mute, PlayerData actor) throws SQLExcept return BanManagerPlugin.getInstance().getIpMuteStorage().unmute(mute, actor); } + /** + * @param mute IP Mute record + * @param actor Who unmuted the ip + * @param silent Whether the unmute should be treated as silent + * @return Returns true if unmute is successful + * @throws SQLException + */ + public static boolean unmute(IpMuteData mute, PlayerData actor, boolean silent) throws SQLException { + return BanManagerPlugin.getInstance().getIpMuteStorage().unmute(mute, actor, "", silent); + } + /** * Thread safe * @@ -390,6 +423,17 @@ public static boolean unban(IpBanData ban, PlayerData actor) throws SQLException return BanManagerPlugin.getInstance().getIpBanStorage().unban(ban, actor); } + /** + * @param ban IP Ban record + * @param actor Who unbanned the ip + * @param silent Whether the unban should be treated as silent + * @return Returns true if unban is successful + * @throws SQLException + */ + public static boolean unban(IpBanData ban, PlayerData actor, boolean silent) throws SQLException { + return BanManagerPlugin.getInstance().getIpBanStorage().unban(ban, actor, "", false, silent); + } + /** * Thread safe * diff --git a/common/src/main/java/me/confuser/banmanager/common/commands/UnbanCommand.java b/common/src/main/java/me/confuser/banmanager/common/commands/UnbanCommand.java index 731bd3826..349919c84 100644 --- a/common/src/main/java/me/confuser/banmanager/common/commands/UnbanCommand.java +++ b/common/src/main/java/me/confuser/banmanager/common/commands/UnbanCommand.java @@ -82,7 +82,7 @@ public boolean onCommand(final CommonSender sender, CommandParser originalParser boolean unbanned; try { - unbanned = getPlugin().getPlayerBanStorage().unban(ban, actor, reason, isDelete); + unbanned = getPlugin().getPlayerBanStorage().unban(ban, actor, reason, isDelete, parser.isSilent()); } catch (SQLException e) { sender.sendMessage(Message.get("sender.error.exception").toString()); e.printStackTrace(); diff --git a/common/src/main/java/me/confuser/banmanager/common/commands/UnbanIpCommand.java b/common/src/main/java/me/confuser/banmanager/common/commands/UnbanIpCommand.java index 1018071f1..674e18ad3 100644 --- a/common/src/main/java/me/confuser/banmanager/common/commands/UnbanIpCommand.java +++ b/common/src/main/java/me/confuser/banmanager/common/commands/UnbanIpCommand.java @@ -87,7 +87,7 @@ public boolean onCommand(final CommonSender sender, CommandParser originalParser boolean unbanned; try { - unbanned = getPlugin().getIpBanStorage().unban(ban, actor, reason, isDelete); + unbanned = getPlugin().getIpBanStorage().unban(ban, actor, reason, isDelete, parser.isSilent()); } catch (SQLException e) { sender.sendMessage(Message.get("sender.error.exception").toString()); e.printStackTrace(); diff --git a/common/src/main/java/me/confuser/banmanager/common/commands/UnbanIpRangeCommand.java b/common/src/main/java/me/confuser/banmanager/common/commands/UnbanIpRangeCommand.java index 2747ac024..bf76ad1e7 100644 --- a/common/src/main/java/me/confuser/banmanager/common/commands/UnbanIpRangeCommand.java +++ b/common/src/main/java/me/confuser/banmanager/common/commands/UnbanIpRangeCommand.java @@ -74,7 +74,7 @@ public boolean onCommand(final CommonSender sender, CommandParser parser) { boolean unbanned; try { - unbanned = getPlugin().getIpRangeBanStorage().unban(ban, actor, reason); + unbanned = getPlugin().getIpRangeBanStorage().unban(ban, actor, reason, parser.isSilent()); } catch (SQLException e) { sender.sendMessage(Message.get("sender.error.exception").toString()); e.printStackTrace(); diff --git a/common/src/main/java/me/confuser/banmanager/common/commands/UnbanNameCommand.java b/common/src/main/java/me/confuser/banmanager/common/commands/UnbanNameCommand.java index eb267ff11..205f50c7c 100644 --- a/common/src/main/java/me/confuser/banmanager/common/commands/UnbanNameCommand.java +++ b/common/src/main/java/me/confuser/banmanager/common/commands/UnbanNameCommand.java @@ -51,7 +51,7 @@ public boolean onCommand(final CommonSender sender, CommandParser parser) { boolean unbanned; try { - unbanned = getPlugin().getNameBanStorage().unban(ban, actor, reason); + unbanned = getPlugin().getNameBanStorage().unban(ban, actor, reason, false, parser.isSilent()); } catch (SQLException e) { sender.sendMessage(Message.get("sender.error.exception").toString()); e.printStackTrace(); diff --git a/common/src/main/java/me/confuser/banmanager/common/commands/UnmuteCommand.java b/common/src/main/java/me/confuser/banmanager/common/commands/UnmuteCommand.java index 6f82db464..e26ce50e6 100644 --- a/common/src/main/java/me/confuser/banmanager/common/commands/UnmuteCommand.java +++ b/common/src/main/java/me/confuser/banmanager/common/commands/UnmuteCommand.java @@ -87,7 +87,7 @@ public void run() { boolean unmuted; try { - unmuted = getPlugin().getPlayerMuteStorage().unmute(mute, actor, reason, isDelete); + unmuted = getPlugin().getPlayerMuteStorage().unmute(mute, actor, reason, isDelete, parser.isSilent()); } catch (SQLException e) { sender.sendMessage(Message.get("sender.error.exception").toString()); e.printStackTrace(); diff --git a/common/src/main/java/me/confuser/banmanager/common/commands/UnmuteIpCommand.java b/common/src/main/java/me/confuser/banmanager/common/commands/UnmuteIpCommand.java index 5bb9aa590..afeb921de 100644 --- a/common/src/main/java/me/confuser/banmanager/common/commands/UnmuteIpCommand.java +++ b/common/src/main/java/me/confuser/banmanager/common/commands/UnmuteIpCommand.java @@ -75,7 +75,7 @@ public boolean onCommand(final CommonSender sender, CommandParser parser) { boolean unmuted; try { - unmuted = getPlugin().getIpMuteStorage().unmute(mute, actor, reason); + unmuted = getPlugin().getIpMuteStorage().unmute(mute, actor, reason, parser.isSilent()); } catch (SQLException e) { sender.sendMessage(Message.get("sender.error.exception").toString()); e.printStackTrace(); diff --git a/common/src/main/java/me/confuser/banmanager/common/storage/IpBanStorage.java b/common/src/main/java/me/confuser/banmanager/common/storage/IpBanStorage.java index 70543aaec..60b12b035 100644 --- a/common/src/main/java/me/confuser/banmanager/common/storage/IpBanStorage.java +++ b/common/src/main/java/me/confuser/banmanager/common/storage/IpBanStorage.java @@ -195,7 +195,11 @@ public boolean unban(IpBanData ban, PlayerData actor, String reason) throws SQLE } public boolean unban(IpBanData ban, PlayerData actor, String reason, boolean delete) throws SQLException { - CommonEvent event = plugin.getServer().callEvent("IpUnbanEvent", ban, actor, reason); + return unban(ban, actor, reason, delete, false); + } + + public boolean unban(IpBanData ban, PlayerData actor, String reason, boolean delete, boolean silent) throws SQLException { + CommonEvent event = plugin.getServer().callEvent("IpUnbanEvent", ban, actor, reason, silent); if (event.isCancelled()) { return false; diff --git a/common/src/main/java/me/confuser/banmanager/common/storage/IpMuteStorage.java b/common/src/main/java/me/confuser/banmanager/common/storage/IpMuteStorage.java index fc369c44c..f91249a29 100644 --- a/common/src/main/java/me/confuser/banmanager/common/storage/IpMuteStorage.java +++ b/common/src/main/java/me/confuser/banmanager/common/storage/IpMuteStorage.java @@ -192,7 +192,11 @@ public boolean unmute(IpMuteData mute, PlayerData actor) throws SQLException { } public boolean unmute(IpMuteData mute, PlayerData actor, String reason) throws SQLException { - CommonEvent event = plugin.getServer().callEvent("IpUnmutedEvent", mute, actor, reason); + return unmute(mute, actor, reason, false); + } + + public boolean unmute(IpMuteData mute, PlayerData actor, String reason, boolean silent) throws SQLException { + CommonEvent event = plugin.getServer().callEvent("IpUnmutedEvent", mute, actor, reason, silent); if (event.isCancelled()) { return false; diff --git a/common/src/main/java/me/confuser/banmanager/common/storage/IpRangeBanStorage.java b/common/src/main/java/me/confuser/banmanager/common/storage/IpRangeBanStorage.java index 6d9781aaa..c63d477f1 100644 --- a/common/src/main/java/me/confuser/banmanager/common/storage/IpRangeBanStorage.java +++ b/common/src/main/java/me/confuser/banmanager/common/storage/IpRangeBanStorage.java @@ -247,7 +247,11 @@ public boolean unban(IpRangeBanData ban, PlayerData actor) throws SQLException { } public boolean unban(IpRangeBanData ban, PlayerData actor, String reason) throws SQLException { - CommonEvent event = plugin.getServer().callEvent("IpRangeUnbanEvent", ban, actor, reason); + return unban(ban, actor, reason, false); + } + + public boolean unban(IpRangeBanData ban, PlayerData actor, String reason, boolean silent) throws SQLException { + CommonEvent event = plugin.getServer().callEvent("IpRangeUnbanEvent", ban, actor, reason, silent); if (event.isCancelled()) { return false; diff --git a/common/src/main/java/me/confuser/banmanager/common/storage/NameBanStorage.java b/common/src/main/java/me/confuser/banmanager/common/storage/NameBanStorage.java index 36027a9cf..2355cffe5 100644 --- a/common/src/main/java/me/confuser/banmanager/common/storage/NameBanStorage.java +++ b/common/src/main/java/me/confuser/banmanager/common/storage/NameBanStorage.java @@ -176,7 +176,11 @@ public boolean unban(NameBanData ban, PlayerData actor, String reason) throws SQ } public boolean unban(NameBanData ban, PlayerData actor, String reason, boolean delete) throws SQLException { - CommonEvent event = plugin.getServer().callEvent("NameUnbanEvent", ban, actor, reason); + return unban(ban, actor, reason, delete, false); + } + + public boolean unban(NameBanData ban, PlayerData actor, String reason, boolean delete, boolean silent) throws SQLException { + CommonEvent event = plugin.getServer().callEvent("NameUnbanEvent", ban, actor, reason, silent); if (event.isCancelled()) { return false; diff --git a/common/src/main/java/me/confuser/banmanager/common/storage/PlayerBanStorage.java b/common/src/main/java/me/confuser/banmanager/common/storage/PlayerBanStorage.java index 4420bd8a9..72e6ae8ef 100644 --- a/common/src/main/java/me/confuser/banmanager/common/storage/PlayerBanStorage.java +++ b/common/src/main/java/me/confuser/banmanager/common/storage/PlayerBanStorage.java @@ -217,7 +217,11 @@ public boolean unban(PlayerBanData ban, PlayerData actor, String reason) throws } public boolean unban(PlayerBanData ban, PlayerData actor, String reason, boolean delete) throws SQLException { - CommonEvent event = plugin.getServer().callEvent("PlayerUnbanEvent", ban, actor, reason); + return unban(ban, actor, reason, delete, false); + } + + public boolean unban(PlayerBanData ban, PlayerData actor, String reason, boolean delete, boolean silent) throws SQLException { + CommonEvent event = plugin.getServer().callEvent("PlayerUnbanEvent", ban, actor, reason, silent); if (event.isCancelled()) { return false; diff --git a/common/src/main/java/me/confuser/banmanager/common/storage/PlayerMuteStorage.java b/common/src/main/java/me/confuser/banmanager/common/storage/PlayerMuteStorage.java index 6ea3b5c25..347af560c 100644 --- a/common/src/main/java/me/confuser/banmanager/common/storage/PlayerMuteStorage.java +++ b/common/src/main/java/me/confuser/banmanager/common/storage/PlayerMuteStorage.java @@ -255,7 +255,11 @@ public boolean unmute(PlayerMuteData mute, PlayerData actor, String reason) thro } public boolean unmute(PlayerMuteData mute, PlayerData actor, String reason, boolean skipRecord) throws SQLException { - CommonEvent event = plugin.getServer().callEvent("PlayerUnmuteEvent", mute, actor, reason); + return unmute(mute, actor, reason, skipRecord, false); + } + + public boolean unmute(PlayerMuteData mute, PlayerData actor, String reason, boolean skipRecord, boolean silent) throws SQLException { + CommonEvent event = plugin.getServer().callEvent("PlayerUnmuteEvent", mute, actor, reason, silent); if (event.isCancelled()) { return false; @@ -289,7 +293,7 @@ public boolean unmute(PlayerMuteData mute, PlayerData actor, String reason, bool * @return true if the mute was deleted, false if it was already paused/modified or event was cancelled */ public boolean unmuteIfExpired(PlayerMuteData mute, PlayerData actor) throws SQLException { - CommonEvent event = plugin.getServer().callEvent("PlayerUnmuteEvent", mute, actor, ""); + CommonEvent event = plugin.getServer().callEvent("PlayerUnmuteEvent", mute, actor, "", false); if (event.isCancelled()) { return false; diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/BanManagerEvents.java b/fabric/src/main/java/me/confuser/banmanager/fabric/BanManagerEvents.java index 16df0bfeb..695918dd4 100644 --- a/fabric/src/main/java/me/confuser/banmanager/fabric/BanManagerEvents.java +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/BanManagerEvents.java @@ -27,9 +27,9 @@ public class BanManagerEvents { }); public static final Event PLAYER_UNBAN_EVENT = EventFactory.createArrayBacked(PlayerUnbanEvent.class, - (listeners) -> (banData, actor, reason) -> { + (listeners) -> (banData, actor, reason, silent) -> { for (PlayerUnbanEvent listener : listeners) { - listener.onPlayerUnban(banData, actor, reason); + listener.onPlayerUnban(banData, actor, reason, silent); } }); @@ -51,9 +51,9 @@ public class BanManagerEvents { }); public static final Event IP_UNBAN_EVENT = EventFactory.createArrayBacked(IpUnbanEvent.class, - (listeners) -> (banData, actor, reason) -> { + (listeners) -> (banData, actor, reason, silent) -> { for (IpUnbanEvent listener : listeners) { - listener.onIpUnban(banData, actor, reason); + listener.onIpUnban(banData, actor, reason, silent); } }); @@ -75,9 +75,9 @@ public class BanManagerEvents { }); public static final Event IP_UNMUTED_EVENT = EventFactory.createArrayBacked(IpUnmutedEvent.class, - (listeners) -> (muteData, actor, reason) -> { + (listeners) -> (muteData, actor, reason, silent) -> { for (IpUnmutedEvent listener : listeners) { - listener.onIpUnmuted(muteData, actor, reason); + listener.onIpUnmuted(muteData, actor, reason, silent); } }); @@ -137,9 +137,9 @@ public class BanManagerEvents { }); public static final Event NAME_UNBAN_EVENT = EventFactory.createArrayBacked(NameUnbanEvent.class, - (listeners) -> (banData, actor, reason) -> { + (listeners) -> (banData, actor, reason, silent) -> { for (NameUnbanEvent listener : listeners) { - listener.onNameUnban(banData, actor, reason); + listener.onNameUnban(banData, actor, reason, silent); } }); @@ -178,9 +178,9 @@ public class BanManagerEvents { }); public static final Event IP_RANGE_UNBAN_EVENT = EventFactory.createArrayBacked(IpRangeUnbanEvent.class, - (listeners) -> (banData, actor, reason) -> { + (listeners) -> (banData, actor, reason, silent) -> { for (IpRangeUnbanEvent listener : listeners) { - listener.onIpRangeUnban(banData, actor, reason); + listener.onIpRangeUnban(banData, actor, reason, silent); } }); @@ -202,9 +202,9 @@ public class BanManagerEvents { }); public static final Event PLAYER_UNMUTE_EVENT = EventFactory.createArrayBacked(PlayerUnmuteEvent.class, - (listeners) -> (muteData, actor, reason) -> { + (listeners) -> (muteData, actor, reason, silent) -> { for (PlayerUnmuteEvent listener : listeners) { - listener.onPlayerUnmute(muteData, actor, reason); + listener.onPlayerUnmute(muteData, actor, reason, silent); } }); @@ -234,7 +234,7 @@ public interface PlayerBannedEvent { @FunctionalInterface public interface PlayerUnbanEvent { - void onPlayerUnban(PlayerBanData banData, PlayerData actor, String reason); + void onPlayerUnban(PlayerBanData banData, PlayerData actor, String reason, boolean silent); } @FunctionalInterface @@ -249,7 +249,7 @@ public interface IpBannedEvent { @FunctionalInterface public interface IpUnbanEvent { - void onIpUnban(IpBanData banData, PlayerData actor, String reason); + void onIpUnban(IpBanData banData, PlayerData actor, String reason, boolean silent); } @FunctionalInterface @@ -264,7 +264,7 @@ public interface IpMutedEvent { @FunctionalInterface public interface IpUnmutedEvent { - void onIpUnmuted(IpMuteData muteData, PlayerData actor, String reason); + void onIpUnmuted(IpMuteData muteData, PlayerData actor, String reason, boolean silent); } @FunctionalInterface @@ -304,7 +304,7 @@ public interface NameBannedEvent { @FunctionalInterface public interface NameUnbanEvent { - void onNameUnban(NameBanData banData, PlayerData actor, String reason); + void onNameUnban(NameBanData banData, PlayerData actor, String reason, boolean silent); } @FunctionalInterface @@ -329,7 +329,7 @@ public interface IpRangeBannedEvent { @FunctionalInterface public interface IpRangeUnbanEvent { - void onIpRangeUnban(IpRangeBanData banData, PlayerData actor, String reason); + void onIpRangeUnban(IpRangeBanData banData, PlayerData actor, String reason, boolean silent); } @FunctionalInterface @@ -344,7 +344,7 @@ public interface PlayerMutedEvent { @FunctionalInterface public interface PlayerUnmuteEvent { - void onPlayerUnmute(PlayerMuteData muteData, PlayerData actor, String reason); + void onPlayerUnmute(PlayerMuteData muteData, PlayerData actor, String reason, boolean silent); } @FunctionalInterface diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/FabricServer.java b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricServer.java index e8ca2f9f6..50f2289d0 100644 --- a/fabric/src/main/java/me/confuser/banmanager/fabric/FabricServer.java +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricServer.java @@ -138,8 +138,8 @@ public CommonEvent callEvent(String name, Object... args) { commonEvent = new CommonEvent(false, silentValue.isSilent()); break; case "PlayerUnbanEvent": - BanManagerEvents.PLAYER_UNBAN_EVENT.invoker().onPlayerUnban((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2]); - commonEvent = new CommonEvent(false, false); + BanManagerEvents.PLAYER_UNBAN_EVENT.invoker().onPlayerUnban((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); + commonEvent = new CommonEvent(false, (boolean) args[3]); break; case "IpBanEvent": @@ -152,8 +152,8 @@ public CommonEvent callEvent(String name, Object... args) { commonEvent = new CommonEvent(false, silentValue.isSilent()); break; case "IpUnbanEvent": - BanManagerEvents.IP_UNBAN_EVENT.invoker().onIpUnban((IpBanData) args[0], (PlayerData) args[1], (String) args[2]); - commonEvent = new CommonEvent(false, false); + BanManagerEvents.IP_UNBAN_EVENT.invoker().onIpUnban((IpBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); + commonEvent = new CommonEvent(false, (boolean) args[3]); break; case "IpMuteEvent": @@ -166,8 +166,8 @@ public CommonEvent callEvent(String name, Object... args) { commonEvent = new CommonEvent(false, silentValue.isSilent()); break; case "IpUnmutedEvent": - BanManagerEvents.IP_UNMUTED_EVENT.invoker().onIpUnmuted((IpMuteData) args[0], (PlayerData) args[1], (String) args[2]); - commonEvent = new CommonEvent(false, false); + BanManagerEvents.IP_UNMUTED_EVENT.invoker().onIpUnmuted((IpMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); + commonEvent = new CommonEvent(false, (boolean) args[3]); break; case "PlayerKickedEvent": @@ -205,8 +205,8 @@ public CommonEvent callEvent(String name, Object... args) { commonEvent = new CommonEvent(false, silentValue.isSilent()); break; case "NameUnbanEvent": - BanManagerEvents.NAME_UNBAN_EVENT.invoker().onNameUnban((NameBanData) args[0], (PlayerData) args[1], (String) args[2]); - commonEvent = new CommonEvent(false, false); + BanManagerEvents.NAME_UNBAN_EVENT.invoker().onNameUnban((NameBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); + commonEvent = new CommonEvent(false, (boolean) args[3]); break; case "PlayerWarnEvent": @@ -229,8 +229,8 @@ public CommonEvent callEvent(String name, Object... args) { commonEvent = new CommonEvent(false, silentValue.isSilent()); break; case "IpRangeUnbanEvent": - BanManagerEvents.IP_RANGE_UNBAN_EVENT.invoker().onIpRangeUnban((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2]); - commonEvent = new CommonEvent(false, false); + BanManagerEvents.IP_RANGE_UNBAN_EVENT.invoker().onIpRangeUnban((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); + commonEvent = new CommonEvent(false, (boolean) args[3]); break; case "PlayerMuteEvent": @@ -243,8 +243,8 @@ public CommonEvent callEvent(String name, Object... args) { commonEvent = new CommonEvent(false, silentValue.isSilent()); break; case "PlayerUnmuteEvent": - BanManagerEvents.PLAYER_UNMUTE_EVENT.invoker().onPlayerUnmute((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2]); - commonEvent = new CommonEvent(false, false); + BanManagerEvents.PLAYER_UNMUTE_EVENT.invoker().onPlayerUnmute((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); + commonEvent = new CommonEvent(false, (boolean) args[3]); break; case "PluginReloadedEvent": diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/HookListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/HookListener.java index 5ce33c4b8..d460c2350 100644 --- a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/HookListener.java +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/HookListener.java @@ -40,7 +40,7 @@ private void onBan(PlayerBanData banData, boolean silent) { listener.onBan(banData, silent); } - private void onUnban(PlayerBanData banData, PlayerData actor, String reason) { + private void onUnban(PlayerBanData banData, PlayerData actor, String reason, boolean silent) { listener.onUnban(banData, actor, reason); } @@ -53,7 +53,7 @@ private void onMute(PlayerMuteData muteData, boolean silent) { listener.onMute(muteData, silent); } - private void onUnmute(PlayerMuteData muteData, PlayerData actor, String reason) { + private void onUnmute(PlayerMuteData muteData, PlayerData actor, String reason, boolean silent) { listener.onUnmute(muteData, actor, reason); } @@ -66,7 +66,7 @@ private void onBan(IpBanData banData, boolean silent) { listener.onBan(banData, silent); } - private void onUnban(IpBanData banData, PlayerData actor, String reason) { + private void onUnban(IpBanData banData, PlayerData actor, String reason, boolean silent) { listener.onUnban(banData, actor, reason); } @@ -79,7 +79,7 @@ private void onBan(IpRangeBanData banData, boolean silent) { listener.onBan(banData, silent); } - private void onUnban(IpRangeBanData banData, PlayerData actor, String reason) { + private void onUnban(IpRangeBanData banData, PlayerData actor, String reason, boolean silent) { listener.onUnban(banData, actor, reason); } diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/WebhookListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/WebhookListener.java index 0959a26ca..a8928cb71 100644 --- a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/WebhookListener.java +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/WebhookListener.java @@ -51,19 +51,19 @@ private void notifyOnWarn(PlayerWarnData warnData, boolean silent) { sendAll(webhooks, silent); } - private void notifyOnUnban(PlayerBanData banData, PlayerData actor, String reason) { + private void notifyOnUnban(PlayerBanData banData, PlayerData actor, String reason, boolean silent) { List webhooks = listener.notifyOnUnban(banData, actor, reason); - sendAll(webhooks, false); + sendAll(webhooks, silent); } - private void notifyOnUnban(IpBanData banData, PlayerData actor, String reason) { + private void notifyOnUnban(IpBanData banData, PlayerData actor, String reason, boolean silent) { List webhooks = listener.notifyOnUnban(banData, actor, reason); - sendAll(webhooks, false); + sendAll(webhooks, silent); } - private void notifyOnUnmute(PlayerMuteData muteData, PlayerData actor, String reason) { + private void notifyOnUnmute(PlayerMuteData muteData, PlayerData actor, String reason, boolean silent) { List webhooks = listener.notifyOnUnmute(muteData, actor, reason); - sendAll(webhooks, false); + sendAll(webhooks, silent); } private void notifyOnReport(PlayerReportData reportData, boolean silent) { diff --git a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java index 09fec619d..2fbc40d85 100644 --- a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java +++ b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java @@ -121,7 +121,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]); break; case "PlayerUnbanEvent": - event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpBanEvent": @@ -131,7 +131,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpBannedEvent((IpBanData) args[0], (boolean) args[1]); break; case "IpUnbanEvent": - event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpMuteEvent": @@ -141,7 +141,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpMutedEvent((IpMuteData) args[0], (boolean) args[1]); break; case "IpUnmutedEvent": - event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerKickedEvent": @@ -169,7 +169,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new NameBannedEvent((NameBanData) args[0], (boolean) args[1]); break; case "NameUnbanEvent": - event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerWarnEvent": @@ -186,7 +186,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpRangeBannedEvent((IpRangeBanData) args[0], (boolean) args[1]); break; case "IpRangeUnbanEvent": - event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerMuteEvent": @@ -196,7 +196,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerMutedEvent((PlayerMuteData) args[0], (boolean) args[1]); break; case "PlayerUnmuteEvent": - event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PluginReloadedEvent": diff --git a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpRangeUnbanEvent.java b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpRangeUnbanEvent.java index 73a65f1a8..d5854cec1 100644 --- a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpRangeUnbanEvent.java +++ b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpRangeUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpRangeUnbanEvent extends CustomCancellableEvent { +public class IpRangeUnbanEvent extends SilentCancellableEvent { @Getter private IpRangeBanData ban; @@ -13,9 +13,12 @@ public class IpRangeUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnbanEvent.java b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnbanEvent.java index 5ae23051b..327a17c2f 100644 --- a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnbanEvent.java +++ b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpUnbanEvent extends CustomCancellableEvent { +public class IpUnbanEvent extends SilentCancellableEvent { @Getter private IpBanData ban; @@ -13,9 +13,12 @@ public class IpUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnmutedEvent.java b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnmutedEvent.java index 794762691..2c8046a72 100644 --- a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnmutedEvent.java +++ b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnmutedEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpUnmutedEvent extends CustomCancellableEvent { +public class IpUnmutedEvent extends SilentCancellableEvent { @Getter private IpMuteData mute; @@ -13,9 +13,12 @@ public class IpUnmutedEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason) { - super(); + this(mute, actor, reason, false); + } + + public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent); this.mute = mute; this.actor = actor; diff --git a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/NameUnbanEvent.java b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/NameUnbanEvent.java index bd9a52be6..389ad6698 100644 --- a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/NameUnbanEvent.java +++ b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/NameUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class NameUnbanEvent extends CustomCancellableEvent { +public class NameUnbanEvent extends SilentCancellableEvent { @Getter private NameBanData ban; @@ -13,9 +13,12 @@ public class NameUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnbanEvent.java b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnbanEvent.java index 1cd1e68a6..38e073e2b 100644 --- a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnbanEvent.java +++ b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class PlayerUnbanEvent extends CustomCancellableEvent { +public class PlayerUnbanEvent extends SilentCancellableEvent { @Getter private PlayerBanData ban; @@ -13,9 +13,12 @@ public class PlayerUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnmuteEvent.java b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnmuteEvent.java index 4aa588085..5aa25f6f2 100644 --- a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnmuteEvent.java +++ b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnmuteEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerMuteData; -public class PlayerUnmuteEvent extends CustomCancellableEvent { +public class PlayerUnmuteEvent extends SilentCancellableEvent { @Getter private PlayerMuteData mute; @@ -13,9 +13,12 @@ public class PlayerUnmuteEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason) { - super(); + this(mute, actor, reason, false); + } + + public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent); this.mute = mute; this.actor = actor; diff --git a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/listeners/WebhookListener.java b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/listeners/WebhookListener.java index e289dd005..553eca66a 100644 --- a/sponge-api7/src/main/java/me/confuser/banmanager/sponge/listeners/WebhookListener.java +++ b/sponge-api7/src/main/java/me/confuser/banmanager/sponge/listeners/WebhookListener.java @@ -57,21 +57,21 @@ public void notifyOnKick(PlayerKickedEvent event) { @Listener(order = Order.POST) public void notifyOnUnban(PlayerUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @IsCancelled(Tristate.UNDEFINED) @Listener(order = Order.POST) public void notifyOnUnban(IpUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @IsCancelled(Tristate.UNDEFINED) @Listener(order = Order.POST) public void notifyOnUnmute(PlayerUnmuteEvent event) { List webhooks = listener.notifyOnUnmute(event.getMute(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @IsCancelled(Tristate.UNDEFINED) diff --git a/sponge/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java b/sponge/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java index ad87fa682..9fba1a5f8 100644 --- a/sponge/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java +++ b/sponge/src/main/java/me/confuser/banmanager/sponge/SpongeServer.java @@ -131,7 +131,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]); break; case "PlayerUnbanEvent": - event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpBanEvent": @@ -141,7 +141,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpBannedEvent((IpBanData) args[0], (boolean) args[1]); break; case "IpUnbanEvent": - event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpMuteEvent": @@ -151,7 +151,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpMutedEvent((IpMuteData) args[0], (boolean) args[1]); break; case "IpUnmutedEvent": - event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerKickedEvent": @@ -179,7 +179,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new NameBannedEvent((NameBanData) args[0], (boolean) args[1]); break; case "NameUnbanEvent": - event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerWarnEvent": @@ -196,7 +196,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpRangeBannedEvent((IpRangeBanData) args[0], (boolean) args[1]); break; case "IpRangeUnbanEvent": - event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerMuteEvent": @@ -206,7 +206,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerMutedEvent((PlayerMuteData) args[0], (boolean) args[1]); break; case "PlayerUnmuteEvent": - event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PluginReloadedEvent": diff --git a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpRangeUnbanEvent.java b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpRangeUnbanEvent.java index 20452eca7..0d52c05c0 100644 --- a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpRangeUnbanEvent.java +++ b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpRangeUnbanEvent.java @@ -4,7 +4,7 @@ import me.confuser.banmanager.common.data.IpRangeBanData; import me.confuser.banmanager.common.data.PlayerData; -public class IpRangeUnbanEvent extends CustomEvent { +public class IpRangeUnbanEvent extends SilentCancellableEvent { @Getter private IpRangeBanData ban; @@ -15,7 +15,11 @@ public class IpRangeUnbanEvent extends CustomEvent { private String reason; public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; this.reason = reason; diff --git a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnbanEvent.java b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnbanEvent.java index 689ec94fa..2c7647650 100644 --- a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnbanEvent.java +++ b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnbanEvent.java @@ -4,7 +4,7 @@ import me.confuser.banmanager.common.data.IpBanData; import me.confuser.banmanager.common.data.PlayerData; -public class IpUnbanEvent extends CustomEvent { +public class IpUnbanEvent extends SilentCancellableEvent { @Getter private IpBanData ban; @@ -15,7 +15,11 @@ public class IpUnbanEvent extends CustomEvent { private String reason; public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; this.reason = reason; diff --git a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnmutedEvent.java b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnmutedEvent.java index 8489cc929..85f41f614 100644 --- a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnmutedEvent.java +++ b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/IpUnmutedEvent.java @@ -4,7 +4,7 @@ import me.confuser.banmanager.common.data.IpMuteData; import me.confuser.banmanager.common.data.PlayerData; -public class IpUnmutedEvent extends CustomEvent { +public class IpUnmutedEvent extends SilentCancellableEvent { @Getter private IpMuteData mute; @@ -15,7 +15,11 @@ public class IpUnmutedEvent extends CustomEvent { private String reason; public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason) { - super(); + this(mute, actor, reason, false); + } + + public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent); this.mute = mute; this.actor = actor; this.reason = reason; diff --git a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/NameUnbanEvent.java b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/NameUnbanEvent.java index c8452fdfc..ff3af21dc 100644 --- a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/NameUnbanEvent.java +++ b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/NameUnbanEvent.java @@ -4,7 +4,7 @@ import me.confuser.banmanager.common.data.NameBanData; import me.confuser.banmanager.common.data.PlayerData; -public class NameUnbanEvent extends CustomEvent { +public class NameUnbanEvent extends SilentCancellableEvent { @Getter private NameBanData ban; @@ -15,7 +15,11 @@ public class NameUnbanEvent extends CustomEvent { private String reason; public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; this.reason = reason; diff --git a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnbanEvent.java b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnbanEvent.java index f79a7b860..b85bd75f9 100644 --- a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnbanEvent.java +++ b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnbanEvent.java @@ -4,7 +4,7 @@ import me.confuser.banmanager.common.data.PlayerBanData; import me.confuser.banmanager.common.data.PlayerData; -public class PlayerUnbanEvent extends CustomEvent { +public class PlayerUnbanEvent extends SilentCancellableEvent { @Getter private PlayerBanData ban; @@ -16,7 +16,11 @@ public class PlayerUnbanEvent extends CustomEvent { private String reason; public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; this.reason = reason; diff --git a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnmuteEvent.java b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnmuteEvent.java index 95a9b8507..24a08a99f 100644 --- a/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnmuteEvent.java +++ b/sponge/src/main/java/me/confuser/banmanager/sponge/api/events/PlayerUnmuteEvent.java @@ -4,7 +4,7 @@ import me.confuser.banmanager.common.data.PlayerMuteData; import me.confuser.banmanager.common.data.PlayerData; -public class PlayerUnmuteEvent extends CustomEvent { +public class PlayerUnmuteEvent extends SilentCancellableEvent { @Getter private PlayerMuteData mute; @@ -16,7 +16,11 @@ public class PlayerUnmuteEvent extends CustomEvent { private String reason; public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason) { - super(); + this(mute, actor, reason, false); + } + + public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent); this.mute = mute; this.actor = actor; this.reason = reason; diff --git a/sponge/src/main/java/me/confuser/banmanager/sponge/listeners/WebhookListener.java b/sponge/src/main/java/me/confuser/banmanager/sponge/listeners/WebhookListener.java index 4f17089bc..9b3a26a8d 100644 --- a/sponge/src/main/java/me/confuser/banmanager/sponge/listeners/WebhookListener.java +++ b/sponge/src/main/java/me/confuser/banmanager/sponge/listeners/WebhookListener.java @@ -49,19 +49,19 @@ public void notifyOnKick(PlayerKickedEvent event) { @Listener(order = Order.POST) public void notifyOnUnban(PlayerUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @Listener(order = Order.POST) public void notifyOnUnban(IpUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @Listener(order = Order.POST) public void notifyOnUnmute(PlayerUnmuteEvent event) { List webhooks = listener.notifyOnUnmute(event.getMute(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @Listener(order = Order.POST) diff --git a/velocity/src/main/java/me/confuser/banmanager/velocity/VelocityServer.java b/velocity/src/main/java/me/confuser/banmanager/velocity/VelocityServer.java index a62035d7e..6f4dc389b 100644 --- a/velocity/src/main/java/me/confuser/banmanager/velocity/VelocityServer.java +++ b/velocity/src/main/java/me/confuser/banmanager/velocity/VelocityServer.java @@ -123,7 +123,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerBannedEvent((PlayerBanData) args[0], (boolean) args[1]); break; case "PlayerUnbanEvent": - event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnbanEvent((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpBanEvent": @@ -133,7 +133,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpBannedEvent((IpBanData) args[0], (boolean) args[1]); break; case "IpUnbanEvent": - event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnbanEvent((IpBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "IpMuteEvent": @@ -143,7 +143,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpMutedEvent((IpMuteData) args[0], (boolean) args[1]); break; case "IpUnmutedEvent": - event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpUnmutedEvent((IpMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerKickedEvent": @@ -171,7 +171,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new NameBannedEvent((NameBanData) args[0], (boolean) args[1]); break; case "NameUnbanEvent": - event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new NameUnbanEvent((NameBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerWarnEvent": @@ -188,7 +188,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new IpRangeBannedEvent((IpRangeBanData) args[0], (boolean) args[1]); break; case "IpRangeUnbanEvent": - event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2]); + event = new IpRangeUnbanEvent((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PlayerMuteEvent": @@ -198,7 +198,7 @@ public CommonEvent callEvent(String name, Object... args) { event = new PlayerMutedEvent((PlayerMuteData) args[0], (boolean) args[1]); break; case "PlayerUnmuteEvent": - event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2]); + event = new PlayerUnmuteEvent((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2], (boolean) args[3]); break; case "PluginReloadedEvent": diff --git a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpRangeUnbanEvent.java b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpRangeUnbanEvent.java index f85429972..e9fad6774 100644 --- a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpRangeUnbanEvent.java +++ b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpRangeUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpRangeUnbanEvent extends CustomCancellableEvent { +public class IpRangeUnbanEvent extends SilentCancellableEvent { @Getter private IpRangeBanData ban; @@ -13,9 +13,12 @@ public class IpRangeUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public IpRangeUnbanEvent(IpRangeBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpUnbanEvent.java b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpUnbanEvent.java index b3ad4caa2..d57e40e08 100644 --- a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpUnbanEvent.java +++ b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpUnbanEvent extends CustomCancellableEvent { +public class IpUnbanEvent extends SilentCancellableEvent { @Getter private IpBanData ban; @@ -13,9 +13,12 @@ public class IpUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public IpUnbanEvent(IpBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpUnmutedEvent.java b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpUnmutedEvent.java index c066bad18..32663dff7 100644 --- a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpUnmutedEvent.java +++ b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/IpUnmutedEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class IpUnmutedEvent extends CustomCancellableEvent { +public class IpUnmutedEvent extends SilentCancellableEvent { @Getter private IpMuteData mute; @@ -13,9 +13,12 @@ public class IpUnmutedEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason) { - super(); + this(mute, actor, reason, false); + } + + public IpUnmutedEvent(IpMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent); this.mute = mute; this.actor = actor; diff --git a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/NameUnbanEvent.java b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/NameUnbanEvent.java index dd86d4ba9..8a9f2f5c3 100644 --- a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/NameUnbanEvent.java +++ b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/NameUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class NameUnbanEvent extends CustomCancellableEvent { +public class NameUnbanEvent extends SilentCancellableEvent { @Getter private NameBanData ban; @@ -13,9 +13,12 @@ public class NameUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public NameUnbanEvent(NameBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/PlayerUnbanEvent.java b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/PlayerUnbanEvent.java index 41f91959f..295d64930 100644 --- a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/PlayerUnbanEvent.java +++ b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/PlayerUnbanEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerData; -public class PlayerUnbanEvent extends CustomCancellableEvent { +public class PlayerUnbanEvent extends SilentCancellableEvent { @Getter private PlayerBanData ban; @@ -13,9 +13,12 @@ public class PlayerUnbanEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason) { - super(); + this(ban, actor, reason, false); + } + + public PlayerUnbanEvent(PlayerBanData ban, PlayerData actor, String reason, boolean silent) { + super(silent); this.ban = ban; this.actor = actor; diff --git a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/PlayerUnmuteEvent.java b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/PlayerUnmuteEvent.java index 5a228d9a7..323622602 100644 --- a/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/PlayerUnmuteEvent.java +++ b/velocity/src/main/java/me/confuser/banmanager/velocity/api/events/PlayerUnmuteEvent.java @@ -5,7 +5,7 @@ import me.confuser.banmanager.common.data.PlayerMuteData; -public class PlayerUnmuteEvent extends CustomCancellableEvent { +public class PlayerUnmuteEvent extends SilentCancellableEvent { @Getter private PlayerMuteData mute; @@ -13,9 +13,12 @@ public class PlayerUnmuteEvent extends CustomCancellableEvent { private PlayerData actor; @Getter private String reason; - public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason) { - super(); + this(mute, actor, reason, false); + } + + public PlayerUnmuteEvent(PlayerMuteData mute, PlayerData actor, String reason, boolean silent) { + super(silent); this.mute = mute; this.actor = actor; diff --git a/velocity/src/main/java/me/confuser/banmanager/velocity/listeners/WebhookListener.java b/velocity/src/main/java/me/confuser/banmanager/velocity/listeners/WebhookListener.java index 0aaaced55..2fae37a21 100644 --- a/velocity/src/main/java/me/confuser/banmanager/velocity/listeners/WebhookListener.java +++ b/velocity/src/main/java/me/confuser/banmanager/velocity/listeners/WebhookListener.java @@ -50,19 +50,19 @@ public void notifyOnWarn(PlayerWarnedEvent event) { @Subscribe(order = PostOrder.LAST) public void notifyOnUnban(PlayerUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @Subscribe(order = PostOrder.LAST) public void notifyOnUnban(IpUnbanEvent event) { List webhooks = listener.notifyOnUnban(event.getBan(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @Subscribe(order = PostOrder.LAST) public void notifyOnUnmute(PlayerUnmuteEvent event) { List webhooks = listener.notifyOnUnmute(event.getMute(), event.getActor(), event.getReason()); - sendAll(webhooks, false); + sendAll(webhooks, event.isSilent()); } @Subscribe(order = PostOrder.LAST)