X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fweaponsystem.qc;h=f8949b15601919e1b863084a1e5653ab3f94d9c2;hb=e57fd111a3279a4aa4789e2c72f9c819a56c7be9;hp=1605db39d2228550b50bce4ab04041b7349e3cbe;hpb=627f552545e5fb21aca7d81d7630adde3c61ad94;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 1605db39d..f8949b156 100644
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -393,10 +393,10 @@ void weapon_thinkf(entity actor, .entity weaponentity, WFRAME fr, float t, void(
 
 	if (this)
 	{
-		FOREACH_CLIENT(true, LAMBDA(
+		FOREACH_CLIENT(true, {
 			if(it == actor || (IS_SPEC(it) && it.enemy == actor))
 				wframe_send(it, this, a, restartanim);
-		));
+		});
 	}
 
 	if ((fr == WFRAME_FIRE1 || fr == WFRAME_FIRE2) && t)
@@ -457,7 +457,8 @@ void W_WeaponFrame(Player actor, .entity weaponentity)
 		.entity wepe1 = weaponentities[0];
 		entity wep1 = actor.(wepe1);
 		this.m_switchweapon = wep1.m_switchweapon;
-		if(!(this.m_switchweapon.spawnflags & WEP_FLAG_DUALWIELD))
+		entity store = IS_PLAYER(actor) ? PS(actor) : actor;
+		if(!(this.m_switchweapon.spawnflags & WEP_FLAG_DUALWIELD) && !(store.dual_weapons & wep1.m_switchweapon.m_wepset))
 		{
 			this.m_weapon = WEP_Null;
 			this.m_switchingweapon = WEP_Null;