From e8f67265e817bdca167fbb9970327588501be580 Mon Sep 17 00:00:00 2001
From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com>
Date: Wed, 29 Dec 2021 02:13:26 +0000
Subject: fix burnmeter and fastball crashes

---
 .../mod/scripts/vscripts/burnmeter/_burnmeter.gnut           | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut')

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut b/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut
index efaea76ff..3151a0f2c 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/burnmeter/_burnmeter.gnut
@@ -242,7 +242,17 @@ void function PlayerUsesAmpedWeaponsBurncardThreaded( entity player )
 	{
 		weapon.RemoveMod( "silencer" ) // both this and the burnmod will override firing fx, if a second one overrides this we crash
 		foreach ( string mod in GetWeaponBurnMods( weapon.GetWeaponClassName() ) )
-			weapon.AddMod( mod )
+		{
+			// catch incompatibilities just in case
+			try
+			{
+				weapon.AddMod( mod )
+			}
+			catch( ex )
+			{
+				weapons.removebyvalue( weapon )
+			}
+		}
 	
 		// needed to display amped weapon time left
 		weapon.SetScriptFlags0( weapon.GetScriptFlags0() | WEAPONFLAG_AMPED )
-- 
cgit v1.2.3