Skip to content

Commit 07ba6ed

Browse files
committed
Use message workaround to suppress DiscordSRV messages during share handling
1 parent f78c746 commit 07ba6ed

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

src/main/java/org/mvplugins/multiverse/inventories/listeners/SilentGrantsListener.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void onPlayerAdvancementDone(PlayerAdvancementDoneEvent event) {
6060
if (playerShareHandlingState.isHandlingSharable(event.getPlayer(), Sharables.ADVANCEMENTS)) {
6161
Logging.finest("Suppressing advancement done message for player %s due to share handling.",
6262
event.getPlayer().getName());
63-
event.message(null);
63+
event.message(net.kyori.adventure.text.Component.text("mvinv:suppressed"));
6464
}
6565
}
6666

@@ -75,9 +75,18 @@ void onPluginEnable(PluginEnableEvent event) {
7575
private class DiscordSrvHook {
7676
@Subscribe
7777
public void onAchievementMessage(AchievementMessagePreProcessEvent event) {
78-
if (playerShareHandlingState.isHandlingSharable(event.getPlayer(), Sharables.ADVANCEMENTS)) {
79-
Logging.finest("Suppressing DiscordSRV advancement grant message for player %s due to share handling.",
80-
event.getPlayer().getName());
78+
if (!(event.getTriggeringBukkitEvent() instanceof PlayerAdvancementDoneEvent advancementEvent)) {
79+
return;
80+
}
81+
if (!hasPlayerAdvancementDoneMessageMethod) {
82+
// paper does not have the method to suppress notifications
83+
return;
84+
}
85+
if (net.kyori.adventure.text.Component.EQUALS.test(
86+
advancementEvent.message(),
87+
net.kyori.adventure.text.Component.text("mvinv:suppressed"))) {
88+
Logging.finest("Suppressing DiscordSRV advancement message for player %s due to share handling.",
89+
advancementEvent.getPlayer().getName());
8190
event.setCancelled(true);
8291
}
8392
}

0 commit comments

Comments
 (0)