From e1bb9f64f9fd2dcf5fc017fdfd8d435ad6ca08ef Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Sun, 20 Jan 2019 15:01:38 -0500
Subject: [PATCH] Fix chat message timing

---
 js/client-battle.js | 2 +-
 src/battle-log.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/client-battle.js b/js/client-battle.js
index 23c2960f4..8acab9474 100644
--- a/js/client-battle.js
+++ b/js/client-battle.js
@@ -208,7 +208,7 @@
 				} else if (logLine.substr(0, 5) === '|win|' || logLine === '|tie') {
 					this.battleEnded = true;
 					this.battle.activityQueue.push(logLine);
-				} else if (logLine.substr(0, 6) === '|chat|' || logLine.substr(0, 3) === '|c|' || logLine.substr(0, 9) === '|chatmsg|' || logLine.substr(0, 10) === '|inactive|') {
+				} else if (logLine.substr(0, 6) === '|chat|' || logLine.substr(0, 3) === '|c|' || logLine.substr(0, 4) === '|c:|' || logLine.substr(0, 9) === '|chatmsg|' || logLine.substr(0, 10) === '|inactive|') {
 					this.battle.instantAdd(logLine);
 				} else {
 					this.battle.activityQueue.push(logLine);
diff --git a/src/battle-log.ts b/src/battle-log.ts
index a736e09d3..7c75b5250 100644
--- a/src/battle-log.ts
+++ b/src/battle-log.ts
@@ -232,7 +232,7 @@ class BattleLog {
 		const el = document.createElement('div');
 		el.className = className;
 		el.innerHTML = innerHTML;
-		this.addNode(el);
+		this.addNode(el, preempt);
 	}
 	addSpacer() {
 		this.addDiv('spacer battle-history', '<br />');