     team = @getTeam(player.id)
     index = team.indexOf(toPokemon)
 
-    # TODO: Fail harder if pokemon not in team
-    if index == -1
-      console.log "#{player.username} made an invalid switch to #{toPokemon}."
-      return
-
     @makeSwitch(player, index)
 
   hasWeather: (weatherName) =>

  # toPosition - the index of the pokemon to switch to
  #
  makeSwitch: (player, toPosition) =>
    # Record the switch
    @playerActions[player.id] =
      type: 'switch'
      to: toPosition

    # TODO: use splice instead of delete
    delete @requests[player.id]

    # Continue the turn if each player has moved.

    for id in @orderIds()
      continue  if id in skipIds

      switch @getAction(id).type
        when 'switch' then @performSwitch(id)
        when 'move'   then @performMove(id)

