Fix: apply translated chat marker before localising message

LoveTropics · Oct 31, 2023 · 1d41030 · 1d41030
1 parent b94a1cc
commit 1d41030
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...main/java/com/lovetropics/extras/mixin/translation/ServerGamePacketListenerImplMixin.java b/...main/java/com/lovetropics/extras/mixin/translation/ServerGamePacketListenerImplMixin.java
@@ -97,16 +97,16 @@ public void handleChat(final ServerboundChatPacket packet) {
         }
     }
 
-    @ModifyVariable(method = "sendPlayerChatMessage", at = @At("HEAD"), argsOnly = true)
-    private PlayerChatMessage modifyChatMessage(final PlayerChatMessage message) {
-        return ((TranslatableChatMessage) (Object) message).ltextras$translate(player.getLanguage());
-    }
-
     @ModifyVariable(method = "sendPlayerChatMessage", at = @At("HEAD"), argsOnly = true)
     private ChatType.Bound modifyChatMessageType(final ChatType.Bound chatType, final PlayerChatMessage message) {
         if (((TranslatableChatMessage) (Object) message).ltextras$hasTranslationFor(player.getLanguage())) {
             return new ChatType.Bound(chatType.chatType(), chatType.name().copy().append(TRANSLATED_MARKER), chatType.targetName());
         }
         return chatType;
     }
+
+    @ModifyVariable(method = "sendPlayerChatMessage", at = @At("HEAD"), argsOnly = true)
+    private PlayerChatMessage modifyChatMessage(final PlayerChatMessage message) {
+        return ((TranslatableChatMessage) (Object) message).ltextras$translate(player.getLanguage());
+    }
 }