From babeed3293ed6542c9648371c1782f886a7ebdc4 Mon Sep 17 00:00:00 2001
From: Magic fTail <runecnielsen3132@gmail.com>
Date: Fri, 3 Apr 2020 00:21:18 +0200
Subject: [PATCH] chatmessagemanager: use default timestamp if none is provided

---
 .../java/net/runelite/client/chat/ChatMessageManager.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
index 34853d6f04..2642dbb162 100644
--- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
@@ -585,7 +585,11 @@ public class ChatMessageManager
 
 		// Update the message with RuneLite additions
 		line.setRuneLiteFormatMessage(message.getRuneLiteFormattedMessage());
-		line.setTimestamp(message.getTimestamp());
+		
+		if (message.getTimestamp() != 0)
+		{
+			line.setTimestamp(message.getTimestamp());
+		}
 
 		update(line);
 	}