Skip to content

Commit 7ac60e1

Browse files
committed
Move return check into the listener (Mike's suggestion
1 parent e1950a2 commit 7ac60e1

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

chatformatter-core/src/main/java/com/eternalcode/formatter/ChatFormatterPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public ChatFormatterPlugin(Plugin plugin) {
6262
server.getPluginCommand("chatformatter").setExecutor(new ChatFormatterCommand(configManager, audienceProvider, miniMessage, mentionPlayerSettings));
6363

6464
this.mentionService = new MentionService(server, pluginConfig, mentionPlayerSettings);
65-
server.getPluginManager().registerEvents(new MentionListener(mentionService), plugin);
65+
server.getPluginManager().registerEvents(new MentionListener(mentionService, pluginConfig), plugin);
6666
server.getPluginManager().registerEvents(new MentionSuggestionsController(), plugin);
6767

6868
server.getPluginManager().registerEvents(new UpdaterController(updaterService, pluginConfig, audienceProvider, miniMessage), plugin);
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.eternalcode.formatter.mention;
22

3+
import com.eternalcode.formatter.config.PluginConfig;
34
import org.bukkit.event.EventHandler;
45
import org.bukkit.event.EventPriority;
56
import org.bukkit.event.Listener;
@@ -8,13 +9,19 @@
89
public class MentionListener implements Listener {
910

1011
private final MentionService mentionService;
12+
private final PluginConfig config;
1113

12-
public MentionListener(MentionService mentionService) {
14+
public MentionListener(MentionService mentionService, PluginConfig config) {
1315
this.mentionService = mentionService;
16+
this.config = config;
1417
}
1518

1619
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
1720
void onMention(AsyncPlayerChatEvent event) {
21+
if (!this.config.mentions.enabled) {
22+
return;
23+
}
24+
1825
this.mentionService.mentionPlayers(event.getMessage());
1926
}
2027
}

chatformatter-core/src/main/java/com/eternalcode/formatter/mention/MentionService.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ void mentionPlayers(String message) {
3737
}
3838

3939
private List<Player> detectMentions(String message) {
40-
if (!this.config.mentions.enabled) {
41-
return List.of();
42-
}
43-
4440
List<Player> mentionedPlayers = new ArrayList<>();
4541

4642
Matcher matcher;

0 commit comments

Comments
 (0)