X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=0034c2dd9ee3b687a0b600eee0b850cc056dfb89;hb=629f6f3b55e891281bb265f8022d129d313c110f;hp=3a99e31ded5d44003bdeba1f36df6bf52083a39a;hpb=ca9f533b1a28ea7648da1df2c6548f11675d2bc1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 3a99e31de..0034c2dd9 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1683,6 +1683,7 @@ void SpectateCopy(entity this, entity spectatee)
 	this.effects = spectatee.effects & EFMASK_CHEAP; // eat performance
 	SetResourceExplicit(this, RES_HEALTH, GetResource(spectatee, RES_HEALTH));
 	CS(this).impulse = 0;
+	this.disableclientprediction = 1; // no need to run prediction on a spectator
 	this.items = spectatee.items;
 	STAT(LAST_PICKUP, this) = STAT(LAST_PICKUP, spectatee);
 	STAT(HIT_TIME, this) = STAT(HIT_TIME, spectatee);
@@ -2194,6 +2195,8 @@ bool PlayerThink(entity this)
 		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 		{
 			.entity weaponentity = weaponentities[slot];
+			if(WEP_CVAR(vortex, charge_always))
+				W_Vortex_Charge(this, weaponentity, frametime);
 			W_WeaponFrame(this, weaponentity);
 		}