ChomeNS/chomens-bot-java
3
1
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix error (mabe)?

Browse source
This commit is contained in:
Chayapak 2023-06-30 21:47:44 +07:00
parent 3627763bb9
commit bb4ff97017
2 changed files with 46 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java
View file

@ -154,57 +154,61 @@ public class ChatPlugin extends Bot.Listener {
}
public void packetReceived (ClientboundDisguisedChatPacket packet) {
final String translation = getTranslationByChatType(packet.getChatType());
try {
final String translation = getTranslationByChatType(packet.getChatType());
final Component component = packet.getMessage();
final Component component = packet.getMessage();
PlayerMessage parsedFromMessage = null;
for (ChatParser parser : chatParsers) {
parsedFromMessage = parser.parse(component);
if (parsedFromMessage != null) break;
}
if (translation != null && parsedFromMessage == null) {
final Component name = packet.getName();
final Component content = packet.getMessage();
TranslatableComponent translatableComponent = Component.translatable(translation);
if (translation.equals("chat.type.team.text") || translation.equals("chat.type.team.sent")) { // ohio
translatableComponent = translatableComponent.args(
Component.empty(), // TODO: fix team name.,.,
name,
content
);
} else {
translatableComponent = translatableComponent.args(name, content);
}
for (Listener listener : listeners) {
listener.systemMessageReceived(translatableComponent);
}
PlayerMessage parsedFromMessage = null;
for (ChatParser parser : chatParsers) {
final PlayerMessage parsed = parser.parse(translatableComponent);
parsedFromMessage = parser.parse(component);
if (parsedFromMessage != null) break;
}
if (parsed == null) continue;
if (translation != null && parsedFromMessage == null) {
final Component name = packet.getName();
final Component content = packet.getMessage();
final PlayerMessage playerMessage = new PlayerMessage(parsed.sender(), packet.getName(), parsed.contents());
TranslatableComponent translatableComponent = Component.translatable(translation);
if (translation.equals("chat.type.team.text") || translation.equals("chat.type.team.sent")) { // ohio
translatableComponent = translatableComponent.args(
Component.empty(), // TODO: fix team name.,.,
name,
content
);
} else {
translatableComponent = translatableComponent.args(name, content);
}
for (Listener listener : listeners) {
listener.systemMessageReceived(translatableComponent);
}
for (ChatParser parser : chatParsers) {
final PlayerMessage parsed = parser.parse(translatableComponent);
if (parsed == null) continue;
final PlayerMessage playerMessage = new PlayerMessage(parsed.sender(), packet.getName(), parsed.contents());
for (Listener listener : listeners) {
listener.playerMessageReceived(playerMessage);
}
}
} else {
if (parsedFromMessage == null) return;
final PlayerMessage playerMessage = new PlayerMessage(parsedFromMessage.sender(), packet.getName(), parsedFromMessage.contents());
for (Listener listener : listeners) {
listener.playerMessageReceived(playerMessage);
listener.systemMessageReceived(component);
}
}
} else {
if (parsedFromMessage == null) return;
final PlayerMessage playerMessage = new PlayerMessage(parsedFromMessage.sender(), packet.getName(), parsedFromMessage.contents());
for (Listener listener : listeners) {
listener.playerMessageReceived(playerMessage);
listener.systemMessageReceived(component);
}
} catch (Exception e) {
e.printStackTrace();
}
}

2
src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/FilterPlugin.java
View file

@ -113,6 +113,8 @@ public class FilterPlugin extends PlayersPlugin.Listener {
}
public void playerMessageReceived (PlayerMessage message) {
if (message.sender().profile().getName() == null) return;
final FilteredPlayer player = getPlayer(message.sender().profile().getName());
if (player == null) return;