From: Mario <mario.mario@y7mail.com>
Date: Wed, 7 Oct 2020 12:37:16 +0000 (+1000)
Subject: Fix Arc continuing to fire after the match ends
X-Git-Tag: xonotic-v0.8.5~741
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d2677b81ce6148fc1c55483032339ad5063a4f9;p=xonotic%2Fxonotic-data.pk3dir.git

Fix Arc continuing to fire after the match ends
---

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index 3af9a18da..f5888c50a 100644
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -186,11 +186,14 @@ void W_Arc_Beam_Think(entity this)
 
 	Weapon thiswep = WEP_ARC;
 
+	// TODO: use standard weapon use checks here!
 	if(
 		!IS_PLAYER(own)
 		||
 		IS_DEAD(own)
 		||
+		game_stopped
+		||
 		!weapon_prepareattack_check(thiswep, own, weaponentity, this.beam_bursting, -1)
 		||
 		own.(weaponentity).m_switchweapon != WEP_ARC