Merge #1127 (AntiSpam fix) into v7.47

Wurst-Imperium · Feb 28, 2025 · 9a5d0d5 · 9a5d0d5
2 parents 291c6c0 + 304b9cd
commit 9a5d0d5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/net/wurstclient/mixin/ChatHudMixin.java b/src/main/java/net/wurstclient/mixin/ChatHudMixin.java
@@ -39,12 +39,14 @@ public class ChatHudMixin
 	@Inject(at = @At("HEAD"),
 		method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;Lnet/minecraft/client/gui/hud/MessageIndicator;)V",
 		cancellable = true)
-	private void onAddMessage(Text message,
+	private void onAddMessage(Text messageDontUse,
 		@Nullable MessageSignatureData signature,
 		@Nullable MessageIndicator indicatorDontUse, CallbackInfo ci,
-		@Local LocalRef<MessageIndicator> indicator)
+		@Local(argsOnly = true) LocalRef<Text> message,
+		@Local(argsOnly = true) LocalRef<MessageIndicator> indicator)
 	{
-		ChatInputEvent event = new ChatInputEvent(message, visibleMessages);
+		ChatInputEvent event =
+			new ChatInputEvent(message.get(), visibleMessages);
 
 		EventManager.fire(event);
 		if(event.isCancelled())
@@ -53,8 +55,8 @@ private void onAddMessage(Text message,
 			return;
 		}
 
-		message = event.getComponent();
+		message.set(event.getComponent());
 		indicator.set(WurstClient.INSTANCE.getOtfs().noChatReportsOtf
-			.modifyIndicator(message, signature, indicator.get()));
+			.modifyIndicator(message.get(), signature, indicator.get()));
 	}
 }