Skip to content

Commit 43ee87c

Browse files
removed message cancelling for chat but removed all recipients
1 parent 86d2e2a commit 43ee87c

File tree

4 files changed

+10
-18
lines changed

4 files changed

+10
-18
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ You can customize the appearance of whispers.
7575
- Write [SPOILER]text[/SPOILER] to make a spoiler.
7676
- Write /show spoiler [1-5] to view spoilers.
7777

78-
### Planned Features
79-
80-
- Fully Async Chat
81-
8278
### Tested Minecraft Versions
8379

8480
- 1.12.2

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.zeroBzeroT.chatCo</groupId>
77
<artifactId>ChatCoPlus</artifactId>
8-
<version>0.27.3</version>
8+
<version>0.27.4</version>
99
<packaging>jar</packaging>
1010
<name>${project.artifactId}</name>
1111

src/main/java/org/zeroBzeroT/chatCo/PublicChat.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,17 @@ public String replaceInlineColors(String message, final Player player) {
5959
@EventHandler(ignoreCancelled = true)
6060
public void onPlayerChat(final AsyncPlayerChatEvent event) {
6161
// Set format to the plain message, since the player is not needed
62+
String oldFormat = event.getFormat();
6263
event.setFormat("%2$s");
6364

64-
// Cancel the event, because the chat is rewritten to system messages
65-
event.setCancelled(true);
66-
6765
// Plain message
6866
final Player player = event.getPlayer();
6967
String legacyMessage = replacePrefixColors(event.getMessage(), player);
7068
legacyMessage = replaceInlineColors(legacyMessage, player);
7169

7270
// Do not send empty messages
7371
if (ChatColor.stripColor(legacyMessage).trim().length() == 0) {
72+
event.setCancelled(true);
7473
return;
7574
}
7675

@@ -91,10 +90,6 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
9190
message.addExtra(componentFromLegacyText("> "));
9291
message.addExtra(messageText);
9392

94-
// Send to console
95-
if (plugin.getConfig().getBoolean("ChatCo.chatToConsole", true))
96-
plugin.getLogger().info(message.toLegacyText());
97-
9893
// Send to the players
9994
for (Player recipient : event.getRecipients()) {
10095
try {
@@ -104,11 +99,16 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
10499
(!chatPlayer.isIgnored(player.getName()) || !plugin.getConfig().getBoolean("ChatCo.ignoresEnabled", true))) {
105100
recipient.spigot().sendMessage(message);
106101
}
107-
108102
} catch (NullPointerException e) {
109103
e.printStackTrace();
110104
}
111105
}
106+
107+
// Do not send it to the players again - no event cancelling, so that other plugins can process the chat
108+
event.getRecipients().clear();
109+
110+
// Write back the old format
111+
event.setFormat(oldFormat);
112112
}
113113

114114
@EventHandler

src/main/java/org/zeroBzeroT/chatCo/Whispers.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.bukkit.ChatColor;
99
import org.bukkit.entity.Player;
1010
import org.bukkit.event.EventHandler;
11-
import org.bukkit.event.EventPriority;
1211
import org.bukkit.event.Listener;
1312
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
1413

@@ -28,10 +27,7 @@ public Whispers(final Main plugin) {
2827
this.plugin = plugin;
2928
}
3029

31-
/**
32-
* high event priority (lower rank) makes it easier for other plugins to block commands of this plugin
33-
*/
34-
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
30+
@EventHandler(ignoreCancelled = true)
3531
public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) {
3632
final String[] args = event.getMessage().split(" ");
3733
final Player sender = event.getPlayer();

0 commit comments

Comments
 (0)