From 0f3259d14ab9a70570e89f02181b59185c494180 Mon Sep 17 00:00:00 2001
From: Thomas Smyth <thomas.smyth3141@gmail.com>
Date: Tue, 15 Sep 2020 01:18:04 +0100
Subject: [PATCH] Fix round winner nulling logic

---
 squad-server/log-parser/rules/new-game.js     | 2 ++
 squad-server/log-parser/rules/round-winner.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/squad-server/log-parser/rules/new-game.js b/squad-server/log-parser/rules/new-game.js
index 892c8af..05b79ce 100644
--- a/squad-server/log-parser/rules/new-game.js
+++ b/squad-server/log-parser/rules/new-game.js
@@ -19,6 +19,8 @@ export default {
       layer: layer ? layer.layer : null
     };
 
+    delete logParser.eventStore.WON;
+
     /* Emit new game event */
     logParser.server.emit(NEW_GAME, data);
   }
diff --git a/squad-server/log-parser/rules/round-winner.js b/squad-server/log-parser/rules/round-winner.js
index 146f384..bb5a08d 100644
--- a/squad-server/log-parser/rules/round-winner.js
+++ b/squad-server/log-parser/rules/round-winner.js
@@ -9,7 +9,7 @@ export default {
       layer: args[4]
     };
 
-    if (logParser.eventStore.WON) logParser.eventStore.WON = data;
-    else logParser.eventStore.WON = { ...data, winner: null };
+    if (logParser.eventStore.WON) logParser.eventStore.WON = { ...data, winner: null };
+    else logParser.eventStore.WON = data;
   }
 };