Merge remote-tracking branch 'runelite/master'

2019-12-06 02:24:28 +01:00
parent 659d4dc178 5679e24b43
commit 3e3938b937
8 changed files with 233 additions and 48 deletions
--- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
@@ -482,7 +482,7 @@ LABEL407:
   runelite_callback     ; Invoke callback
   pop_int               ; Pop the id of the messageNode
   sload                  0                  ; Load the log in/out message
-   join_string            3                  ; Add the timestamp to the message
+   join_string            2                  ; Add the timestamp to the message
   iload                  9
   iload                  10
   iconst                 10682368