From feaed2cc9be01985c009a824456b9513b48f41d8 Mon Sep 17 00:00:00 2001
From: Stalitsa <kolokotronakos@gmail.com>
Date: Thu, 29 Apr 2021 00:43:36 +0100
Subject: [PATCH] Fix the issue with ChatListener while the discord bot is
disabled.
---
.../custom/service/discord/listeners/ChatListener.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/listeners/ChatListener.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/listeners/ChatListener.java
index c051b375fe..cab711a756 100644
--- a/src/main/java/com/l2jserver/datapack/custom/service/discord/listeners/ChatListener.java
+++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/listeners/ChatListener.java
@@ -54,7 +54,7 @@ public class ChatListener extends ListenerAdapter {
case 17 -> "Hero";
default -> null;
};
- if (type != null) {
+ if (type != null && discord().enableBot()) {
String replacedText = onShiftItems(event.getActiveChar(), event.getText());
eb.setColor(Color.CYAN);
eb.setTitle("***___" + type + "___***");
@@ -73,7 +73,7 @@ public class ChatListener extends ListenerAdapter {
long count = item.getCount();
String enchant = item.getEnchantLevel() > 0 ? " +" + item.getEnchantLevel() : "";
String name = item.getItem().getItemGrade() != CrystalType.NONE ? item.getItem().getItemGrade().name() + "-" + item.getName() : "" + item.getName();
- final String info = name + enchant + "\n" + (item.isStackable() ? df.format(count) : "");
+ final String info = name + enchant + (item.isStackable() ? "\n" + df.format(count) : "");
message = message.replace(matcher.group(0) + "\b", info);
}
if (message.contains("\b")) {
--
GitLab