X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=b6d6e25e8dd9e3347387eaaacbada358d69d5feb;hb=866e651a9a86250d2aa36350bb756344463b6f57;hp=c037662846bb66e28b2649e221282ec018f3ee5d;hpb=21da5e8108d2f93f04e181f2a4d17f106a92edae;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index c03766284..b6d6e25e8 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1192,7 +1192,7 @@ void ClientConnect(entity this)
 	if (PlayerInList(this, autocvar_g_playban_list))
 		TRANSMUTE(Observer, this);
 
-	if (PlayerInList(this, autocvar_g_muteban_list)) // muteban
+	if (PlayerInList(this, autocvar_g_chatban_list)) // chatban
 		CS(this).muted = true;
 
 	MUTATOR_CALLHOOK(ClientConnect, this);
@@ -2298,6 +2298,11 @@ void ObserverOrSpectatorThink(entity this)
 		CS(this).autojoin_checked = true;
 		TRANSMUTE(Player, this);
 		PutClientInServer(this);
+
+		.entity weaponentity = weaponentities[0];
+		if(this.(weaponentity).m_weapon == WEP_Null)
+			W_NextWeapon(this, 0, weaponentity);
+
 		return;
 	}