X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=3f9fdd41bfdc615427f207152b2e56898db35e58;hb=f34e36384aea3cb5e6c6818de704e6da2ee125b5;hp=d211e0f384347a562839778a2a91e7870820aee5;hpb=c6fae88a462bf6e5ded37ac2fcdde0f844be9314;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index d211e0f38..3f9fdd41b 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1078,7 +1078,7 @@ void ClientConnect()
 
 	this.netname_previous = strzone(this.netname);
 
-	Send_Notification(NOTIF_ALL, NULL, MSG_INFO, (teamplay ? APP_TEAM_ENT_4(this, INFO_JOIN_CONNECT_TEAM_) : INFO_JOIN_CONNECT), this.netname);
+	Send_Notification(NOTIF_ALL, NULL, MSG_INFO, ((teamplay && IS_PLAYER(this)) ? APP_TEAM_ENT_4(this, INFO_JOIN_CONNECT_TEAM_) : INFO_JOIN_CONNECT), this.netname);
 
 	stuffcmd(this, clientstuff, "\n");
 	stuffcmd(this, "cl_particles_reloadeffects\n"); // TODO do we still need this?
@@ -1330,7 +1330,7 @@ void respawn()
 			SUB_SetFade (self, time + autocvar_g_respawn_ghosts_maxtime / 2 + random () * (autocvar_g_respawn_ghosts_maxtime - autocvar_g_respawn_ghosts_maxtime / 2), 1.5);
 	}
 
-	CopyBody(1);
+	CopyBody(self, 1);
 
 	self.effects |= EF_NODRAW; // prevent another CopyBody
 	PutClientInServer();
@@ -1827,7 +1827,7 @@ void LeaveSpectatorMode()
 
 			PutClientInServer();
 
-			if(IS_PLAYER(self)) { Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_JOIN_PLAY, self.netname); }
+			if(IS_PLAYER(self)) { Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay) ? APP_TEAM_ENT_4(this, INFO_JOIN_PLAY_TEAM_) : INFO_JOIN_PLAY), self.netname); }
 		}
 		else
 			stuffcmd(self, "menu_showteamselect\n");