Skip to content

Commit 178bbef

Browse files
committed
Use default item display if character limit is reached instead of blocking
1 parent 226d0d8 commit 178bbef

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/com/loohp/interactivechat/Listeners/ChatPackets.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@ public void onPacketSending(PacketEvent event) {
8787
} catch (Exception skip) {
8888
return;
8989
}
90-
}
91-
92-
BaseComponent basecomponent = ChatComponentUtils.join(ComponentSerializer.parse(ChatColorUtils.filterIllegalColorCodes(ComponentSerializer.toString(basecomponentarray))));
90+
}
91+
BaseComponent basecomponent = ChatComponentUtils.join(ComponentSerializer.parse(ChatColorUtils.filterIllegalColorCodes(ComponentSerializer.toString(basecomponentarray))));
9392
debug++;
9493
try {
9594
if (basecomponent.toLegacyText().equals("")) {

src/com/loohp/interactivechat/Listeners/Events.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ private void translateAltColorCode(AsyncPlayerChatEvent event) {
193193

194194
String message = ChatColorUtils.translateAlternateColorCodes(InteractiveChat.chatAltColorCode.get(), event.getMessage());
195195
event.setMessage(message);
196+
//Bukkit.getConsoleSender().sendMessage(message.replace(ChatColor.COLOR_CHAR, '&'));
196197
}
197198

198199
private void translateAltColorCode(PlayerCommandPreprocessEvent event) {

src/com/loohp/interactivechat/Modules/ItemDisplay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public static BaseComponent process(BaseComponent basecomponent, Optional<Player
146146
}
147147
String itemJson = ItemNBTUtils.getNMSItemStackJson(item);
148148
//Bukkit.getConsoleSender().sendMessage(itemJson.length() + "");
149-
if (((InteractiveChat.version.isLegacy() || InteractiveChat.protocolManager.getProtocolVersion(reciever) < 393) && itemJson.length() > 30000) || (!InteractiveChat.version.isLegacy() && itemJson.length() > 200000)) {
149+
if ((itemJson.length() > 30000 && InteractiveChat.block30000) || ((InteractiveChat.version.isLegacy() || InteractiveChat.protocolManager.getProtocolVersion(reciever) < 393) && itemJson.length() > 30000) || (!InteractiveChat.version.isLegacy() && itemJson.length() > 200000)) {
150150
ItemStack trimedItem = new ItemStack(item.getType());
151151
trimedItem.addUnsafeEnchantments(item.getEnchantments());
152152
if (item.hasItemMeta() && item.getItemMeta().hasLore()) {

0 commit comments

Comments
 (0)