From ab785335f759f57d4beb0d92ae7c9953864b08ea Mon Sep 17 00:00:00 2001
From: newby <newby@rakis.net>
Date: Fri, 13 Oct 2023 09:41:00 -0700
Subject: [PATCH] pm: scout: fix conc + dash during prematch

---
 csqc/weapon_predict.qc | 3 +++
 share/classes.qc       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/csqc/weapon_predict.qc b/csqc/weapon_predict.qc
index ad6baabd..abbddf85 100644
--- a/csqc/weapon_predict.qc
+++ b/csqc/weapon_predict.qc
@@ -909,6 +909,9 @@ float PM_Enabled();
 void PM_AddNudgeDash(float cseq);
 
 static void WP_Special() {
+    if (prematch)
+        return;
+
     if (pstate_pred.server_time < pstate_pred.special_next)
         return;
 
diff --git a/share/classes.qc b/share/classes.qc
index 831dd0db..a0125d42 100644
--- a/share/classes.qc
+++ b/share/classes.qc
@@ -133,6 +133,10 @@ static inline void ConcAction(entity ent, float itime, float mag, float flip) {
 #endif
 
 void Conc_Update(ConcState *cs, entity ent, float ctime) {
+#ifdef SSQC
+    if (ent.invincible_finished > time)  // TODO: Is this worth sharing?
+        cs->mag = 0;
+#endif
     if (!cs->mag  || ctime < cs->next)
         return;