From 8b7a9a8958f87dfe23593ccfd44824e7aafdae88 Mon Sep 17 00:00:00 2001 From: FurnyGo <68079109+FurnyGo@users.noreply.github.com> Date: Sat, 30 Mar 2024 01:54:35 +0400 Subject: [PATCH 1/3] sendChatMessage event fix --- .../meteorclient/mixin/ClientPlayNetworkHandlerMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java index cf9b5d7bb2..325a5e58b8 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java @@ -140,7 +140,7 @@ private void onItemPickupAnimation(ItemPickupAnimationS2CPacket packet, Callback private void onSendChatMessage(String message, CallbackInfo ci) { if (ignoreChatMessage) return; - if (!message.startsWith(Config.get().prefix.get()) && (BaritoneUtils.IS_AVAILABLE || !message.startsWith(BaritoneUtils.getPrefix()))) { + if (!message.startsWith(Config.get().prefix.get()) || (BaritoneUtils.IS_AVAILABLE && !message.startsWith(BaritoneUtils.getPrefix()))) { SendMessageEvent event = MeteorClient.EVENT_BUS.post(SendMessageEvent.get(message)); if (!event.isCancelled()) { From 0ca191b8e14e25ab0a70343104deb6719424648c Mon Sep 17 00:00:00 2001 From: FurnyGo <68079109+FurnyGo@users.noreply.github.com> Date: Wed, 8 May 2024 03:23:49 +0400 Subject: [PATCH 2/3] oops --- .../meteorclient/mixin/ClientPlayNetworkHandlerMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java index 325a5e58b8..301dc840f5 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java @@ -140,7 +140,7 @@ private void onItemPickupAnimation(ItemPickupAnimationS2CPacket packet, Callback private void onSendChatMessage(String message, CallbackInfo ci) { if (ignoreChatMessage) return; - if (!message.startsWith(Config.get().prefix.get()) || (BaritoneUtils.IS_AVAILABLE && !message.startsWith(BaritoneUtils.getPrefix()))) { + if (!message.startsWith(Config.get().prefix.get()) && (BaritoneUtils.IS_AVAILABLE && !message.startsWith(BaritoneUtils.getPrefix()))) { SendMessageEvent event = MeteorClient.EVENT_BUS.post(SendMessageEvent.get(message)); if (!event.isCancelled()) { From 17bd8acb18680888f9a79cc7f5f9a377daeb3fad Mon Sep 17 00:00:00 2001 From: FurnyGo <68079109+FurnyGo@users.noreply.github.com> Date: Wed, 8 May 2024 03:29:32 +0400 Subject: [PATCH 3/3] ?? --- .../meteorclient/mixin/ClientPlayNetworkHandlerMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java index 301dc840f5..edb3c29d22 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java @@ -140,7 +140,7 @@ private void onItemPickupAnimation(ItemPickupAnimationS2CPacket packet, Callback private void onSendChatMessage(String message, CallbackInfo ci) { if (ignoreChatMessage) return; - if (!message.startsWith(Config.get().prefix.get()) && (BaritoneUtils.IS_AVAILABLE && !message.startsWith(BaritoneUtils.getPrefix()))) { + if (!message.startsWith(Config.get().prefix.get()) && !(BaritoneUtils.IS_AVAILABLE && message.startsWith(BaritoneUtils.getPrefix()))) { SendMessageEvent event = MeteorClient.EVENT_BUS.post(SendMessageEvent.get(message)); if (!event.isCancelled()) {